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

This commit is contained in:
Brian Coca 2015-07-24 18:42:53 -04:00
parent 8ace659d4c
commit 0858d97c44

View file

@ -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: