- Display/email reason for service restart/reload failure (if init script d...

ftimme

2013-07-16 9cdf9d9ee39bade1b6c242ca4fb458a1de2c76a7

 server/plugins-available/apache2_plugin.inc.php

@@ -1476,8 +1476,8 @@
         $apache_online_status_before_restart = $this->_checkTcp('localhost',80);
         $app->log('Apache status is: '.$apache_online_status_before_restart,LOGLEVEL_DEBUG);

         $retval = $app->services->restartService('httpd','restart'); // $retval is 0 on success and > 0 on failure
         $app->log('Apache restart return value is: '.$retval,LOGLEVEL_DEBUG);
         $retval = $app->services->restartService('httpd','restart'); // $retval['retval'] is 0 on success and > 0 on failure
         $app->log('Apache restart return value is: '.$retval['retval'],LOGLEVEL_DEBUG);
         
         // wait a few seconds, before we test the apache status again
         $apache_online_status_after_restart = false;
@@ -1489,9 +1489,10 @@
         }
         //* Check if apache restarted successfully if it was online before
         $app->log('Apache online status after restart is: '.$apache_online_status_after_restart,LOGLEVEL_DEBUG);
         if($apache_online_status_before_restart && !$apache_online_status_after_restart || $retval > 0) {
         if($apache_online_status_before_restart && !$apache_online_status_after_restart || $retval['retval'] > 0) {
            $app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].'. Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
            $app->system->copy($vhost_file,$vhost_file.'.err');
            if(is_array($retval['output']) && !empty($retval['output'])) $app->log('Reason for Apache restart failure: '.implode("\n", $retval['output']),LOGLEVEL_WARN);
            if(is_file($vhost_file.'~')) {
               //* Copy back the last backup file
               $app->system->copy($vhost_file.'~',$vhost_file);