summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClayton Smith <argilo@gmail.com>2018-09-21 10:02:37 -0700
committerClayton Smith <argilo@gmail.com>2018-09-21 10:02:37 -0700
commitf410994109958286cd5e175883b87cde264783e8 (patch)
tree470ce2ddabb57f6bbd586d140c5a3bac483b6bd6
parent267d669eb21c514c18a6ee979f5cf247d251f1ad (diff)
Fix infinite loop when extract_docs worker dies.
-rw-r--r--grc/core/utils/extract_docs.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/grc/core/utils/extract_docs.py b/grc/core/utils/extract_docs.py
index 39cb6ec096..306940dcfd 100644
--- a/grc/core/utils/extract_docs.py
+++ b/grc/core/utils/extract_docs.py
@@ -199,7 +199,10 @@ class SubprocessLoader(object):
raise ValueError('Got wrong auth code')
return cmd, args
except ValueError:
- continue # ignore invalid output from worker
+ if self._worker.poll():
+ raise IOError("Worker died")
+ else:
+ continue # ignore invalid output from worker
else:
raise IOError("Can't read worker response")