From 79408707c6c9a3fe34149e8fe4ac2ea5cf0783e7 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Wed, 2 Nov 2016 20:56:08 +0100 Subject: [PATCH] Better error handling in sage-cleaner --- src/bin/sage-cleaner | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/bin/sage-cleaner b/src/bin/sage-cleaner index 20221ed21e7..5fbe2172aad 100755 --- a/src/bin/sage-cleaner +++ b/src/bin/sage-cleaner @@ -103,9 +103,13 @@ def kill_spawned_jobs(jobfile, parent_pid): logger.info("Killing %s's spawned jobs", parent_pid) killed_them_all = True for job in open(jobfile).readlines(): - pid, cmd = job.strip().split(' ', 1) - logger.info("--> Killing '%s' with PID %s and parent PID %s", cmd, pid, parent_pid) - pid = int(pid) + try: + pid, cmd = job.strip().split(' ', 1) + pid = int(pid) + logger.info("--> Killing %r with PID %s and parent PID %s", cmd, pid, parent_pid) + except Exception: + logger.error("Exception while processing job %r from %s, ignoring", job, jobfile) + continue try: pgrp = os.getpgid(pid) logger.info("--> Killing process group %s", pgrp)