r3007 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-07-23 23:10:17 +0200 (Wed, 23 Jul 2008)
New Revision: 3007

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_child.c
Log:
Make the manager respect the diag_bitmap for child core creation.



Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2008-07-23 21:04:12 UTC (rev 3006)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2008-07-23 21:10:17 UTC (rev 3007)
@@ -168,7 +168,10 @@
 	REPORT(LOG_ERR,
 	    "Child (%d) not responding to ping, killing it.",
 	    child_pid);
-	(void)kill(child_pid, SIGKILL);
+	if (params->diag_bitmap & 0x1000)
+		(void)kill(child_pid, SIGKILL);
+	else
+		(void)kill(child_pid, SIGQUIT);
 	return (0);
 }