[GNUnet-SVN] r21569 - gnunet/contrib

[gnunet]

Author: wachs
Date: 2012-05-24 12:58:23 +0200 (Thu, 24 May 2012)
New Revision: 21569

Modified:
   gnunet/contrib/gnunet_janitor.py.in
Log:
- fix


Modified: gnunet/contrib/gnunet_janitor.py.in
===================================================================
--- gnunet/contrib/gnunet_janitor.py.in 2012-05-24 09:35:37 UTC (rev 21568)
+++ gnunet/contrib/gnunet_janitor.py.in 2012-05-24 10:58:23 UTC (rev 21569)
@@ -34,6 +34,9 @@
 if os.name == 'nt':
   from win32com.client import GetObject
   WMI = GetObject('winmgmts:')
+  killsignal = signal.SIGTERM # any valid value will result in 
TerminateProcess()
+else:
+  killsignal = signal.SIGKILL  
 
 def get_process_list ():
   result = []
@@ -60,7 +63,7 @@
     if re.match (r'gnunet-service-arm', p[1]):
       print ("killing arm process {0:5} {1}".format (p[0], p[1]))
       try:
-        os.kill (int (p[0]), signal.SIGKILL)
+        os.kill (int (p[0]), killsignal)
       except OSError as e:
         print ("failed: {0}".format (e))
         pass
@@ -68,7 +71,7 @@
     if not re.match (r'gnunet-service-arm', p[1]):
       print ("killing non-arm process {0:5} {1}".format (p[0], p[1]))
       try:
-        os.kill (int (p[0]), signal.SIGKILL)
+        os.kill (int (p[0]), killsignal)
       except OSError as e:
         print ("failed: {0}".format (e))
         pass