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

When restarting, also use the flag file as a backup, as on CentOS 8 sometimes signals don't get processed

Browse Source
This commit is contained in:
Jamie Cameron
2020-09-04 10:02:36 -07:00
parent 677948bd9a
commit 4ca40b79c0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web-lib-funcs.pl
View File

@@ -2126,6 +2126,7 @@ if ($main::webmin_script_type eq 'web' && !$ENV{"MINISERV_CONFIG"} &&
}
my $i;
my $flag = $miniserv{'restartflag'} || $var_directory."/restart-flag";
if ($gconfig{'os_type'} ne 'windows') {
# On Unix systems, we can restart with a signal
my ($pid, $addr, $i);
@@ -2152,10 +2153,13 @@ if ($gconfig{'os_type'} ne 'windows') {
}
}
# Just signal miniserv to restart
# Just signal miniserv to restart, and also create the flag file in
# case signals aren't being processed
if (!&kill_logged('HUP', $pid)) {
&error("Incorrect Webmin PID $pid") if (!$ignore);
}
open(TOUCH, ">$flag");
close(TOUCH);
# Wait till new PID is written, indicating a restart
for($i=0; $i<60; $i++) {
@@ -2172,7 +2176,7 @@ if ($gconfig{'os_type'} ne 'windows') {
}
else {
# On Windows, we need to use the flag file
open(TOUCH, ">$miniserv{'restartflag'}");
open(TOUCH, ">$flag");
close(TOUCH);
}