Merge pull request #25 from diggyk/master

Added Sentry support

bin/hermes-server

@@ -18,6 +18,12 @@ from hermes.settings import settings
 
 from sqlalchemy.exc import OperationalError
 
+try:
+    from raven.contrib.tornado import AsyncSentryClient
+    raven_installed = True
+except ImportError:
+    raven_installed = False
+
 sa_log = logging.getLogger("sqlalchemy.engine.base.Engine")
 
 
@@ -72,6 +78,20 @@ def main():
 
     application = Application(my_settings=my_settings, **tornado_settings)
 
+    # If Sentry DSN is set, try to import raven
+    if settings.sentry_dsn:
+        if not raven_installed:
+            logging.warning(
+                'Sentry DSN set but raven not installed. Not enabling Sentry.'
+            )
+        else:
+            logging.info(
+                'Sentry DSN set and raven installed. Enabling Sentry.'
+            )
+            application.sentry_client = AsyncSentryClient(settings.sentry_dsn)
+    else:
+        logging.info('Sentry DSN not set. Not enabling Sentry.')
+
     port = args.port or settings.port
 
     logging.info(

config/dev.yaml

@@ -52,3 +52,6 @@ email_notifications: false
 # This is the expiration (in seconds) of auth_tokens used for API calls
 # Type: int
 auth_token_expiry: 600
+
+# Sentry DSN if using Sentry to log exceptions.
+# sentry_dsn:

hermes/handlers/util.py

@@ -14,6 +14,17 @@
 # Logging object
 log = logging.getLogger(__name__)
 
+# If raven library is available, modify the base handler to support Sentry.
+try:
+    from raven.contrib.tornado import SentryMixin
+except ImportError:
+    pass
+else:
+    class SentryHandler(SentryMixin, RequestHandler):
+        pass
+    RequestHandler = SentryHandler
+
+
 
 class PluginHelper(object):
     @classmethod

hermes/settings.py

@@ -61,4 +61,5 @@ def __getattr__(self, name):
     "api_xsrf_enabled": True,
     "secret_key": "SECRET_KEY",
     "auth_token_expiry": 600,  # 10 minutes
+    "sentry_dsn": None,
 })

hermes/version.py

@@ -1 +1 @@
-__version__ = "0.2.1"
+__version__ = "0.2.2"