diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-07 17:49:10 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-07 17:49:10 +0000 |
commit | 23f103db87f8567814a1ec9ebdbb090e881ea32d (patch) | |
tree | 7a3adf5c44cbb84148b4185101696ceb46909da2 /contrib/gnunet_janitor.py.in | |
parent | 0663a057d7611270d5f41ae8b345125d737387f2 (diff) | |
download | gnunet-23f103db87f8567814a1ec9ebdbb090e881ea32d.tar.gz gnunet-23f103db87f8567814a1ec9ebdbb090e881ea32d.zip |
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
Diffstat (limited to 'contrib/gnunet_janitor.py.in')
-rw-r--r-- | contrib/gnunet_janitor.py.in | 16 |
1 files changed, 12 insertions, 4 deletions
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 (): | |||
55 | gnunet_procs.append (p) | 55 | gnunet_procs.append (p) |
56 | for p in gnunet_procs: | 56 | for p in gnunet_procs: |
57 | if re.match (r'gnunet-service-arm', p[1]): | 57 | if re.match (r'gnunet-service-arm', p[1]): |
58 | print ("killing arm {0:5} {1}".format (p[0], p[1])) | 58 | print ("killing arm process {0:5} {1}".format (p[0], p[1])) |
59 | os.kill (p[0], signal.SIGTERM) | 59 | try: |
60 | os.kill (p[0], signal.SIGTERM) | ||
61 | except OSError as e: | ||
62 | print ("failed: {0}".format (e)) | ||
63 | pass | ||
60 | for p in gnunet_procs: | 64 | for p in gnunet_procs: |
61 | if not re.match (r'gnunet-service-arm', p[1]): | 65 | if not re.match (r'gnunet-service-arm', p[1]): |
62 | print ("killing arm {0:5} {1}".format (p[0], p[1])) | 66 | print ("killing non-arm process {0:5} {1}".format (p[0], p[1])) |
63 | os.kill (p[0], signal.SIGTERM) | 67 | try: |
68 | os.kill (p[0], signal.SIGTERM) | ||
69 | except OSError as e: | ||
70 | print ("failed: {0}".format (e)) | ||
71 | pass | ||
64 | 72 | ||
65 | if __name__ == '__main__': | 73 | if __name__ == '__main__': |
66 | sys.exit (main ()) | 74 | sys.exit (main ()) |