- Improved recognition of when a service (Apache, nginx, etc.) was really r...

ftimme

2013-07-11 412eec8a5fb6208d361c033653015ff3c74ad3ab

 server/plugins-available/nginx_plugin.inc.php

@@ -1526,7 +1526,8 @@
         $nginx_online_status_before_restart = $this->_checkTcp('localhost',80);
         $app->log('nginx status is: '.$nginx_online_status_before_restart,LOGLEVEL_DEBUG);

         $app->services->restartService('httpd','restart');
         $retval = $app->services->restartService('httpd','restart'); // $retval is 0 on success and > 0 on failure
         $app->log('nginx restart return value is: '.$retval,LOGLEVEL_DEBUG);
         
         // wait a few seconds, before we test the apache status again
         sleep(2);
@@ -1534,8 +1535,8 @@
         //* Check if nginx restarted successfully if it was online before
         $nginx_online_status_after_restart = $this->_checkTcp('localhost',80);
         $app->log('nginx online status after restart is: '.$nginx_online_status_after_restart,LOGLEVEL_DEBUG);
         if($nginx_online_status_before_restart && !$nginx_online_status_after_restart) {
            $app->log('nginx 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);
         if($nginx_online_status_before_restart && !$nginx_online_status_after_restart || $retval > 0) {
            $app->log('nginx 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_file($vhost_file.'~')) {
               //* Copy back the last backup file