From 412eec8a5fb6208d361c033653015ff3c74ad3ab Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 11 Jul 2013 10:59:00 -0400
Subject: [PATCH] - Improved recognition of when a service (Apache, nginx, etc.) was really restarted/reloaded successfully. Checking port 80 is not enough because nginx reloads silently, ignoring faulty configuration files, but returns a value > 0. If we don't check the return value, nginx will refuse to start when someone issues a restart the next time.
---
server/mods-available/web_module.inc.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index dd7aba0..2e51c6f 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -211,11 +211,11 @@
}
if($action == 'restart') {
- exec($conf['init_scripts'] . '/' . $daemon . ' restart');
+ exec($conf['init_scripts'] . '/' . $daemon . ' restart', $output, $retval);
} else {
- exec($conf['init_scripts'] . '/' . $daemon . ' reload');
+ exec($conf['init_scripts'] . '/' . $daemon . ' reload', $output, $retval);
}
-
+ return $retval;
}
function restartPHP_FPM($action = 'restart') {
@@ -229,7 +229,8 @@
if(!$init_script) $init_script = $conf['init_scripts'].'/'.$web_config['php_fpm_init_script'];
- exec($init_script.' '.$action);
+ exec($init_script.' '.$action, $output, $retval);
+ return $retval;
}
} // end class
--
Gitblit v1.9.1