[Erp5-report] r14343 - /erp5/trunk/utils/oood/start.py

[nobody at svn.erp5.org]

Author: bartek
Date: Thu May  3 19:17:39 2007
New Revision: 14343

URL: http://svn.erp5.org?rev=14343&view=rev
Log:
fixed a bug which, if a particular combination of pids was present in the system, cause the oood to break when trying to restart OOo instance

Modified:
    erp5/trunk/utils/oood/start.py

Modified: erp5/trunk/utils/oood/start.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/start.py?rev=14343&r1=14342&r2=14343&view=diff
==============================================================================
--- erp5/trunk/utils/oood/start.py (original)
+++ erp5/trunk/utils/oood/start.py Thu May  3 19:17:39 2007
@@ -122,9 +122,12 @@
     # OOo instance span on several process, find all of them
     pid_list = os.popen('ps -A -o pid,ppid').read().split('\n')
     instance_pid_list = []
-    for pid in pid_list:
-      if pid.find('%s' % instance_master_pid) != -1:
-        instance_pid_list.append(int(pid.strip().split(' ')[0]))
+    for pid_line in pid_list:
+      pid_pair = re.findall('(\d+)', pid_line)
+      if len(pid_pair) == 2:
+        pid_pair = [int(pid) for pid in pid_pair]
+        if instance_master_pid in pid_pair:
+          instance_pid_list.append(pid_pair[0])
     if len(instance_pid_list) > 0:
       _l("Is still running and span on several processes: %s" % ', '.join([str(x) for x in instance_pid_list]), i)
       # Kill all instance processes