master: Increase timeout after config reload before killing still running old processes

Previously after config reload master waited 6s before killing old
processes. However, lib-master could have waited for 30s before it
gracefully stopped the process. So increase the timeout to 35s.

diff --git a/src/master/service.c b/src/master/service.c
index 4fe6299fa60f1824c9605b3f4a55c88c8785e544..c5ce52ca6b07ff27f406f0c0395333acc31360e9 100644 (file)
--- a/src/master/service.c
+++ b/src/master/service.c
@@ -18,7 +18,9 @@
 #include <unistd.h>
 #include <signal.h>
 
-#define SERVICE_DIE_TIMEOUT_MSECS (1000*6)
+/* How long to wait after config reload before killing processes that aren't
+   dying by themself. Keep this higher than MASTER_SERVICE_DIE_TIMEOUT_MSECS. */
+#define SERVICE_DIE_TIMEOUT_MSECS (1000*35)
 #define SERVICE_LOGIN_NOTIFY_MIN_INTERVAL_SECS 2
 
 HASH_TABLE_TYPE(pid_process) service_pids;