From 9cdf9d9ee39bade1b6c242ca4fb458a1de2c76a7 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 16 Jul 2013 10:06:24 -0400
Subject: [PATCH] - Display/email reason for service restart/reload failure (if init script doesn't suppress error messages).
---
server/mods-available/web_module.inc.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index 2e51c6f..52d4aed 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -210,10 +210,11 @@
}
}
+ $retval = array('output' => '', 'retval' => 0);
if($action == 'restart') {
- exec($conf['init_scripts'] . '/' . $daemon . ' restart', $output, $retval);
+ exec($conf['init_scripts'] . '/' . $daemon . ' restart', $retval['output'], $retval['retval']);
} else {
- exec($conf['init_scripts'] . '/' . $daemon . ' reload', $output, $retval);
+ exec($conf['init_scripts'] . '/' . $daemon . ' reload', $retval['output'], $retval['retval']);
}
return $retval;
}
@@ -229,7 +230,8 @@
if(!$init_script) $init_script = $conf['init_scripts'].'/'.$web_config['php_fpm_init_script'];
- exec($init_script.' '.$action, $output, $retval);
+ $retval = array('output' => '', 'retval' => 0);
+ exec($init_script.' '.$action, $retval['output'], $retval['retval']);
return $retval;
}
--
Gitblit v1.9.1