Commit 0858d97c by Brian Coca

also captures typeerrors for when not getting a proper string in output

parent 8ace659d
......@@ -295,7 +295,7 @@ class TaskExecutor:
# response, so we parse it here and replace the result
try:
result = json.loads(result.get('stdout'))
except ValueError, e:
except (TypeError, ValueError) as e:
return dict(failed=True, msg="The async task did not return valid JSON: %s" % str(e))
if self._task.poll > 0:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment