michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Wait for apache to actuallt re-read config after a graceful restart

Browse Source
This commit is contained in:
Jamie Cameron
2011-09-11 21:52:50 -07:00
parent 540e333723
commit c0cf45836b
1 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apache/apache-lib.pl
View File

@@ -1472,6 +1472,7 @@ elsif ($config{'apply_cmd'}) {
&clean_environment();
local $out = &backquote_logged("$config{'apply_cmd'} 2>&1");
&reset_environment();
&wait_for_graceful() if ($config{'apply_cmd'} =~ /graceful/);
if ($?) {
return "<pre>".&html_escape($out)."</pre>";
}
@@ -1481,15 +1482,18 @@ elsif (-x &translate_filename($config{'apachectl_path'})) {
if ($httpd_modules{'core'} >= 2) {
# Do a graceful restart
&clean_environment();
local $out = &backquote_logged("$config{'apachectl_path'} graceful 2>&1");
local $out = &backquote_logged(
"$config{'apachectl_path'} graceful 2>&1");
&reset_environment();
&wait_for_graceful();
if ($?) {
return "<pre>".&html_escape($out)."</pre>";
}
}
else {
&clean_environment();
local $out = &backquote_logged("$config{'apachectl_path'} restart 2>&1");
local $out = &backquote_logged(
"$config{'apachectl_path'} restart 2>&1");
&reset_environment();
if ($out !~ /httpd restarted/) {
return "<pre>".&html_escape($out)."</pre>";
@@ -1502,10 +1506,34 @@ else {
<PID> =~ /(\d+)/ || return &text('restart_epid2', $pidfile);
close(PID);
&kill_logged('HUP', $1) || return &text('restart_esig', $1);
&wait_for_graceful();
}
return undef;
}
# wait_for_graceful([timeout])
# Wait for some time for Apache to complete a graceful restart
sub wait_for_graceful
{
local $timeout = $_[0] || 10;
local $errorlog = &get_error_log();
return -1 if (!$errorlog || !-r $errorlog);
local @st = stat($errorlog);
my $start = time();
while(time() - $start < $timeout) {
sleep(1);
open(ERRORLOG, $errorlog);
seek(ERRORLOG, $st[7], 0);
local $/ = undef;
local $rest = <ERRORLOG>;
close(ERRORLOG);
if ($rest =~ /resuming\s+normal\s+operations/i) {
return 1;
}
}
return 0;
}
# stop_apache()
# Attempts to stop the running Apache process, and returns undef on success or
# an error message on failure
@@ -1615,6 +1643,18 @@ if (!&is_apache_running()) {
return undef;
}
# get_error_log()
# Returns the path to the global error log, if possible
sub get_error_log
{
local $conf = &get_config();
local $errorlogstr = &find_directive_struct("ErrorLog", $conf);
local $errorlog = $errorlogstr ? $errorlogstr->{'words'}->[0]
: "logs/error_log";
$errorlog = &server_root($errorlog, $conf);
return $errorlog;
}
sub is_apache_running
{
if ($gconfig{'os_type'} eq 'windows') {