Merge pull request #74 from StackStorm/catch-expr-eval-errors

Handle expression functions returning other exception types
StackStorm · Jun 28, 2018 · 7d19799 · 7d19799
2 parents 09be269 + 34bc678
commit 7d19799
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/orchestra/conducting.py b/orchestra/conducting.py
@@ -318,7 +318,7 @@ def get_start_tasks(self):
         for task_node in self.graph.roots:
             try:
                 tasks.append(self.get_task(task_node['id']))
-            except exc.ExpressionEvaluationException as e:
+            except Exception as e:
                 self.log_error(str(e), task_id=task_node['id'])
                 self.set_workflow_state(states.FAILED)
                 continue
@@ -344,7 +344,7 @@ def get_next_tasks(self, task_id=None):
             for staged_task_id in staged_tasks:
                 try:
                     next_tasks.append(self.get_task(staged_task_id))
-                except exc.ExpressionEvaluationException as e:
+                except Exception as e:
                     self.log_error(str(e), task_id=staged_task_id)
                     self.set_workflow_state(states.FAILED)
                     continue
@@ -376,7 +376,7 @@ def get_next_tasks(self, task_id=None):
 
                 try:
                     next_tasks.append(self.get_task(next_task_id))
-                except exc.ExpressionEvaluationException as e:
+                except Exception as e:
                     self.log_error(str(e), task_id=next_task_id)
                     self.set_workflow_state(states.FAILED)
                     continue
@@ -475,7 +475,7 @@ def update_task_flow(self, task_id, state, result=None):
                     criteria = task_transition[3].get('criteria') or []
                     evaluated_criteria = [expr.evaluate(c, current_ctx) for c in criteria]
                     task_flow_entry[task_transition_id] = all(evaluated_criteria)
-                except exc.ExpressionEvaluationException as e:
+                except Exception as e:
                     self.log_error(str(e), task_id, task_transition_id)
                     self.set_workflow_state(states.FAILED)
                     continue