Commit 4ae1d0ca authored by anarcat's avatar anarcat Committed by anarcat

#654610 - output the apache error on failures to restart

parent 9cab65b8
......@@ -224,11 +224,12 @@ function _provision_apache_restart_apache($cause_error = FALSE) {
//TODO : test for this instead of relying on a configuration setting?
$return = drush_shell_exec(escapeshellcmd(drush_get_option('restart_cmd')));
if (!$return) {
$msg = join("\n", drush_shell_exec_output());
if ($cause_error) {
return drush_set_error('PROVISION_WEB_RESTART_FAILED', dt("Web server could not be restarted. Changes might not be available until this has been done."));
return drush_set_error('PROVISION_WEB_RESTART_FAILED', dt("Web server could not be restarted. Changes might not be available until this has been done. (error: %msg)", array("%msg" => $msg)));
}
else {
drush_log(dt("Web server could not be restarted. Changes might not be available until this has been done."), "warning");
drush_log(dt("Web server could not be restarted. Changes might not be available until this has been done. (error: %msg)", array("%msg" => $msg)), "warning");
}
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment