[Erp5-report] r36142 luke - /erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

[nobody at svn.erp5.org]

Author: luke
Date: Wed Jun  9 11:03:10 2010
New Revision: 36142

URL: http://svn.erp5.org?rev=36142&view=rev
Log:
 - survive in case of having bad pid file

Modified:
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

Modified: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py?rev=36142&r1=36141&r2=36142&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] Wed Jun  9 11:03:10 2010
@@ -661,9 +661,12 @@
       # Pid file is present
       logging.warning('Timmy already have the pid file %s' %
           self.options.pid_file)
-      pid = open(self.options.pid_file, 'r').readline()
+      try:
+        pid = int(open(self.options.pid_file, 'r').readline())
+      except ValueError:
+        pid = None
       # XXX This could use psutil library.
-      if os.path.exists("/proc/%s" % pid):
+      if pid is not None and os.path.exists("/proc/%s" % pid):
         # In case process is present, ignore.
         logging.critical('A Timmy process is running with pid %s' % pid)
         sys.exit(1)