D853.1775306805.diff
No OneTemporary
Actions

Authored By

Unknown

Size

764 B

Referenced Files

None

Subscribers

None

D853.1775306805.diff
View Options

	diff --git a/kolabd/__init__.py b/kolabd/__init__.py
	--- a/kolabd/__init__.py
	+++ b/kolabd/__init__.py
	@@ -29,6 +29,7 @@
	import sys
	import time
	import traceback
	+import multiprocessing

	import pykolab

	@@ -370,11 +371,15 @@
	at the same time, and therefore we need to test if the PID file
	exists, and only try/except removing it.
	"""
	- if os.access(conf.pidfile, os.R_OK):
	- try:
	+ try:
	+ for p in multiprocessing.active_children():
	+ p.terminate()
	+
	+ if os.access(conf.pidfile, os.R_OK):
	os.remove(conf.pidfile)
	- except Exception:
	- pass
	+
	+ except Exception:
	+ pass

	raise SystemExit