diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-05-24 10:58:23 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-05-24 10:58:23 +0000 |
commit | d0f6a7bb13abbe5c4a93ff09ead83c7e91bf5a11 (patch) | |
tree | 0e148dad7fbf37183b4d60c77c4a6402af257ae9 /contrib | |
parent | 101f5787ac60dafa175950fb714c6d4cc4906478 (diff) | |
download | gnunet-d0f6a7bb13abbe5c4a93ff09ead83c7e91bf5a11.tar.gz gnunet-d0f6a7bb13abbe5c4a93ff09ead83c7e91bf5a11.zip |
- fix
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/gnunet_janitor.py.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/gnunet_janitor.py.in b/contrib/gnunet_janitor.py.in index f68ff1cb2..056ab9bc4 100644 --- a/contrib/gnunet_janitor.py.in +++ b/contrib/gnunet_janitor.py.in | |||
@@ -34,6 +34,9 @@ import signal | |||
34 | if os.name == 'nt': | 34 | if os.name == 'nt': |
35 | from win32com.client import GetObject | 35 | from win32com.client import GetObject |
36 | WMI = GetObject('winmgmts:') | 36 | WMI = GetObject('winmgmts:') |
37 | killsignal = signal.SIGTERM # any valid value will result in TerminateProcess() | ||
38 | else: | ||
39 | killsignal = signal.SIGKILL | ||
37 | 40 | ||
38 | def get_process_list (): | 41 | def get_process_list (): |
39 | result = [] | 42 | result = [] |
@@ -60,7 +63,7 @@ def main (): | |||
60 | if re.match (r'gnunet-service-arm', p[1]): | 63 | if re.match (r'gnunet-service-arm', p[1]): |
61 | print ("killing arm process {0:5} {1}".format (p[0], p[1])) | 64 | print ("killing arm process {0:5} {1}".format (p[0], p[1])) |
62 | try: | 65 | try: |
63 | os.kill (int (p[0]), signal.SIGKILL) | 66 | os.kill (int (p[0]), killsignal) |
64 | except OSError as e: | 67 | except OSError as e: |
65 | print ("failed: {0}".format (e)) | 68 | print ("failed: {0}".format (e)) |
66 | pass | 69 | pass |
@@ -68,7 +71,7 @@ def main (): | |||
68 | if not re.match (r'gnunet-service-arm', p[1]): | 71 | if not re.match (r'gnunet-service-arm', p[1]): |
69 | print ("killing non-arm process {0:5} {1}".format (p[0], p[1])) | 72 | print ("killing non-arm process {0:5} {1}".format (p[0], p[1])) |
70 | try: | 73 | try: |
71 | os.kill (int (p[0]), signal.SIGKILL) | 74 | os.kill (int (p[0]), killsignal) |
72 | except OSError as e: | 75 | except OSError as e: |
73 | print ("failed: {0}".format (e)) | 76 | print ("failed: {0}".format (e)) |
74 | pass | 77 | pass |