From 23f103db87f8567814a1ec9ebdbb090e881ea32d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 7 Oct 2011 17:49:10 +0000 Subject: LRN: Small janitor fixes * Prevent janitor from failing if a process can't be killed (it might be dead by the time janitor gets around to killing it). * Fix janitor messages about killing arm/non-arm processes --- contrib/gnunet_janitor.py.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/gnunet_janitor.py.in b/contrib/gnunet_janitor.py.in index 52de8f9e9..c11ff4f12 100644 --- a/contrib/gnunet_janitor.py.in +++ b/contrib/gnunet_janitor.py.in @@ -55,12 +55,20 @@ def main (): gnunet_procs.append (p) for p in gnunet_procs: if re.match (r'gnunet-service-arm', p[1]): - print ("killing arm {0:5} {1}".format (p[0], p[1])) - os.kill (p[0], signal.SIGTERM) + print ("killing arm process {0:5} {1}".format (p[0], p[1])) + try: + os.kill (p[0], signal.SIGTERM) + except OSError as e: + print ("failed: {0}".format (e)) + pass for p in gnunet_procs: if not re.match (r'gnunet-service-arm', p[1]): - print ("killing arm {0:5} {1}".format (p[0], p[1])) - os.kill (p[0], signal.SIGTERM) + print ("killing non-arm process {0:5} {1}".format (p[0], p[1])) + try: + os.kill (p[0], signal.SIGTERM) + except OSError as e: + print ("failed: {0}".format (e)) + pass if __name__ == '__main__': sys.exit (main ()) -- cgit v1.2.3