michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-29 07:10:31 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2775 from webmin/dev/fix-miniserv-restart-loop

Browse Source 
Fix to recover from a stale PID file whose PID was reused
This commit is contained in:
Jamie Cameron
2026-06-25 08:23:26 +12:00
committed by GitHub
parent d2f9e339f2 18296d3a55
commit 031a8b8261
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
miniserv.pl
View File

@@ -139,12 +139,14 @@ if (-l $perl_path) {
# Check vital config options
&update_vital_config();
# Check if already running via the PID file
if (open(PIDFILE, $config{'pidfile'})) {
# Check if already running via the PID file. In foreground mode, systemd or
# the socket bind owns duplicate-start detection.
if (!$config{'nofork'} && !$nofork_argv && open(PIDFILE, $config{'pidfile'})) {
my $already = <PIDFILE>;
close(PIDFILE);
chop($already);
if ($already && $already != $$ && kill(0, $already)) {
chomp($already);
$already =~ s/^\s+|\s+$//g;
if ($already =~ /^\d+$/ && $already != $$ && kill(0, $already)) {
die "Webmin is already running with PID $already\n";
}
}