[GNUnet-SVN] r21562 - gnunet/contrib

[gnunet]

Author: wachs
Date: 2012-05-23 09:10:19 +0200 (Wed, 23 May 2012)
New Revision: 21562

Modified:
   gnunet/contrib/gnunet_janitor.py.in
Log:
LRN's patch


Modified: gnunet/contrib/gnunet_janitor.py.in
===================================================================
--- gnunet/contrib/gnunet_janitor.py.in 2012-05-22 15:43:30 UTC (rev 21561)
+++ gnunet/contrib/gnunet_janitor.py.in 2012-05-23 07:10:19 UTC (rev 21562)
@@ -44,7 +44,10 @@
   else:
     pids = [pid for pid in os.listdir('/proc') if pid.isdigit ()]
     for pid in pids:
-      result.append ((pid, open (os.path.join ('/proc', pid, 'comm'), 
'rb').read ()))
+      with open (os.path.join ('/proc', pid, 'cmdline'), 'rb') as p:
+        cmdline = p.read ().split ('\x00')
+        if len (cmdline) > 0:
+          result.append ((pid, cmdline[0]))
   return result
 
 def main ():
@@ -57,7 +60,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 (p[0], signal.SIGTERM)
+        os.kill (int (p[0]), signal.SIGKILL)
       except OSError as e:
         print ("failed: {0}".format (e))
         pass
@@ -65,7 +68,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 (p[0], signal.SIGTERM)
+        os.kill (int (p[0]), signal.SIGKILL)
       except OSError as e:
         print ("failed: {0}".format (e))
         pass