specific handlers can overwrite error handling settings

circuits · Feb 15, 2017 · bccfe7f · bccfe7f
1 parent 1d52151
commit bccfe7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/circuits/core/handlers.py b/circuits/core/handlers.py
@@ -72,6 +72,7 @@ def wrapper(f):
         f.priority = kwargs.get("priority", 0)
         f.channel = kwargs.get("channel", None)
         f.override = kwargs.get("override", False)
+        f.on_error = kwargs.get("on_error", None)
 
         args = getargspec(f)[0]
 

diff --git a/circuits/core/manager.py b/circuits/core/manager.py
@@ -707,7 +707,11 @@ def _dispatcher(self, event, channels, remaining):  # noqa
                 event.reduce_time_left(TIMEOUT)
 
             if err is not None:
-                if event.on_error in ("abort", "throw_first"):
+                if event_handler.on_error in ("abort", "throw_first"):
+                    break
+                elif event_handler.on_error in ("ignore",):
+                    continue
+                elif event.on_error in ("abort", "throw_first"):
                     break
                 elif event.on_error in ("ignore", "throw_last"):
                     continue