[opsview-base] [446] wait for clean shutdown of worker processes to avoid creating zombies

[s...@opsview.com]

Revision

446

Author

aburzynski

Date

2014-05-19 17:35:41 +0100 (Mon, 19 May 2014)

Log Message

wait for clean shutdown of worker processes to avoid creating zombies

Modified Paths

• trunk/Makefile

Added Paths

• trunk/patches/nagios_defunct_reload_workers.patch

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2014-05-19 16:29:46 UTC (rev 445)
+++ trunk/Makefile	2014-05-19 16:35:41 UTC (rev 446)
@@ -635,6 +635,7 @@
 	cd ${NAGIOS} && patch -p1 < ../patches/nagios_iobroker_poll_after_objects.patch
 	cd ${NAGIOS} && patch -p1 < ../patches/nagios_dont_log_disabled_passive_checks.patch
 	cd ${NAGIOS} && patch -p1 < ../patches/nagios_fix_plugin_output_timeout_message.patch
+	cd ${NAGIOS} && patch -p1 < ../patches/nagios_defunct_reload_workers.patch
 	if [ $(KERNEL_NAME) = Linux ] ; then \
 		cd ${NAGIOS} && CFLAGS="${CFLAGS}" ./configure --with-nagios-user=$(NAGIOS_USER) --with-nagios-group=$(NAGIOS_GROUP) --with-command-group=$(NAGIOS_GROUP) --with-cgiurl=/cgi-bin --with-htmurl=/ --enable-libtap ; \
 	elif [ $(KERNEL_NAME) = Darwin ] ; then \

Added: trunk/patches/nagios_defunct_reload_workers.patch
===================================================================
--- trunk/patches/nagios_defunct_reload_workers.patch	                        (rev 0)
+++ trunk/patches/nagios_defunct_reload_workers.patch	2014-05-19 16:35:41 UTC (rev 446)
@@ -0,0 +1,12 @@
+diff -ur nagios-4.0.20130912.orig/base/workers.c nagios-4.0.20130912/base/workers.c
+--- nagios-4.0.20130912.orig/base/workers.c	2014-05-19 15:17:50.000000000 +0000
++++ nagios-4.0.20130912/base/workers.c	2014-05-19 16:27:00.000000000 +0000
+@@ -353,6 +353,8 @@
+ 
+ 	iobroker_close(nagios_iobs, wp->sd);
+ 
++ 	sleep(1);
++
+ 	/* reap our possibly lost children */
+ 	while (waitpid(-1, &i, WNOHANG) > 0)
+ 		; /* do nothing */