From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 26 Apr 2010 20:57:11 +0000 (-0600)
Subject: Do not check pid file unless we are a master process. Kids processes start and
X-Git-Tag: SQUID_3_2_0_1~93^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b81949b9b72cd3cb539d1459d0d86077514d968d;p=thirdparty%2Fsquid.git

Do not check pid file unless we are a master process. Kids processes start and
run when the pid file may point to a live Squid process.

There are some must-be-single processes like Coordinator, but it is probably
better to manage their uniqueness differently because there may be many kinds
of must-be-single processes.
---

diff --git a/src/main.cc b/src/main.cc
index 0a8cdece32..2815a5c31b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1540,6 +1540,10 @@ mainStartScript(const char *prog)
 static int
 checkRunningPid(void)
 {
+    // master process must start alone, but its kids processes may co-exist
+    if (KidIdentifier != 0)
+        return 0;
+
     pid_t pid;
 
     if (!debug_log)