Merge pull request #261 from danielwelch/error-reporter

Error reporter

django_q/cluster.py

@@ -25,7 +25,7 @@ import signing
 import tasks
 
 from django_q.compat import range
-from django_q.conf import Conf, logger, psutil, get_ppid, rollbar
+from django_q.conf import Conf, logger, psutil, get_ppid, error_reporter, rollbar
 from django_q.models import Task, Success, Schedule
 from django_q.status import Stat, Status
 from django_q.brokers import get_broker
@@ -365,6 +365,8 @@ def worker(task_queue, result_queue, timer, timeout=Conf.TIMEOUT):
                 f = getattr(m, func)
             except (ValueError, ImportError, AttributeError) as e:
                 result = (e, False)
+                if error_reporter:
+                    error_reporter.report()
                 if rollbar:
                     rollbar.report_exc_info()
         # We're still going
@@ -380,6 +382,8 @@ def worker(task_queue, result_queue, timer, timeout=Conf.TIMEOUT):
                 result = (res, True)
             except Exception as e:
                 result = ('{}'.format(e), False)
+                if error_reporter:
+                    error_reporter.report()
                 if rollbar:
                     rollbar.report_exc_info()
         # Process result

django_q/conf.py

@@ -9,6 +9,7 @@ from django.conf import settings
 
 # external
 import os
+import pkg_resources
 
 # optional
 try:
@@ -141,9 +142,12 @@ class Conf(object):
     # The redis stats key
     Q_STAT = 'django_q:{}:cluster'.format(PREFIX)
 
-    # Optional Rollbar key
+    # Optional rollbar key
     ROLLBAR = conf.get('rollbar', {})
 
+    # Optional error reporting setup
+    ERROR_REPORTER = conf.get('error_reporter', {})
+
     # OSX doesn't implement qsize because of missing sem_getvalue()
     try:
         QSIZE = Queue().qsize() == 0
@@ -177,6 +181,7 @@ if not logger.handlers:
     handler.setFormatter(formatter)
     logger.addHandler(handler)
 
+
 # rollbar
 if Conf.ROLLBAR:
     rollbar_conf = deepcopy(Conf.ROLLBAR)
@@ -190,6 +195,38 @@ else:
     rollbar = None
 
 
+# Error Reporting Interface
+class ErrorReporter(object):
+
+    # initialize with iterator of reporters (better name, targets?)
+    def __init__(self, reporters):
+        self.targets = [target for target in reporters]
+
+    # report error to all configured targets
+    def report(self):
+        for t in self.targets:
+            t.report()
+
+
+# error reporting setup (sentry or rollbar)
+if Conf.ERROR_REPORTER:
+    error_conf = deepcopy(Conf.ERROR_REPORTER)
+    try:
+        reporters = []
+        # iterate through the configured error reporters,
+        # and instantiate an ErrorReporter using the provided config
+        for name, conf in error_conf.items():
+            Reporter = pkg_resources.iter_entry_points(
+                    'djangoq.errorreporters', name).load()
+            e = Reporter(**conf)
+            reporters.append(e)
+        error_reporter = ErrorReporter(reporters)
+    except ImportError:
+        error_reporter = None
+else:
+    error_reporter = None
+
+
 # get parent pid compatibility
 def get_ppid():
     if hasattr(os, 'getppid'):