Fix handling of invalid pid file

CGAL · Oct 12, 2023 · 3863f80 · 3863f80
1 parent a672598
commit 3863f80
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/test_cgal.py b/test_cgal.py
@@ -152,15 +152,15 @@ def main():
     # Setup the pidfile handling
     if os.path.isfile(pidfile):
         logging.warning('pidfile {} already exists. Killing other process.'.format(pidfile))
-        with open(pidfile, 'r') as pf:
-            oldpid = int(pf.read().strip())
         try:
+            with open(pidfile, 'r') as pf:
+                oldpid = int(pf.read().strip())
             os.kill(oldpid, signal.SIGTERM)
             # Wait for the process to terminate.
             while pid_exists(oldpid):
                 pass
-        except OSError:
-            logging.warning('pidfile {} did contain invalid pid {}.'.format(pidfile, oldpid))
+        except (OSError, ValueError):
+            logging.warning('pidfile {} did contain invalid pid.'.format(pidfile))
 
     with open(pidfile, 'w') as pf:
         pid = str(os.getpid())