michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

In a restart where the process execs itself, the PID file will contain own PID

Browse Source
This commit is contained in:
Jamie Cameron
2020-02-04 22:07:55 -08:00
parent ec7140cc87
commit ccf75a57e0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
miniserv.pl
View File

@@ -122,7 +122,7 @@ if (open(PIDFILE, $config{'pidfile'})) {
my $already = <PIDFILE>;
close(PIDFILE);
chop($already);
if ($already && kill(0, $already)) {
if ($already && $already != $$ && kill(0, $already)) {
die "Webmin is already running with PID $already\n";
}
}
@@ -770,6 +770,8 @@ while(1) {
do { $pid = waitpid(-1, WNOHANG);
@childpids = grep { $_ != $pid } @childpids;
} while($pid != 0 && $pid != -1);
@childpids = grep { !kill(0, $_) } @childpids;
# run the unblocking procedure to check if enough time has passed to
# unblock hosts that heve been blocked because of password failures