Support opbeat logging with celery

- support opbeat logging with celery
- modify sentry imports to avoid conflicts

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/taskapp/celery.py

@@ -27,10 +27,27 @@ class CeleryConfig(AppConfig):
         {% if cookiecutter.use_sentry == "y" -%}
         if hasattr(settings, 'RAVEN_CONFIG'):
             # Celery signal registration
-            from raven import Client
+            from raven import Client as RavenClient
-            from raven.contrib.celery import register_signal
+            from raven.contrib.celery import register_signal as raven_register_signal
-            client = Client(dsn=settings.RAVEN_CONFIG['DSN'])
+    
-            register_signal(client)
+            raven_client = RavenClient(dsn=settings.RAVEN_CONFIG['DSN'])
+            raven_register_signal(raven_client)
+        {%- endif %}
+        
+        {% if cookiecutter.use_opbeat == "y" -%}
+        if hasattr(settings, 'OPBEAT'):
+            from opbeat.contrib.django.models import client as opbeat_client
+            from opbeat.contrib.django.models import logger as opbeat_logger
+            from opbeat.contrib.django.models import register_handlers as opbeat_register_handlers
+            from opbeat.contrib.celery import register_signal as opbeat_register_signal
+
+            try:
+                opbeat_register_signal(opbeat_client)
+            except Exception as e:
+                opbeat_logger.exception('Failed installing celery hook: %s' % e)
+
+            if 'opbeat.contrib.django' in settings.INSTALLED_APPS:
+                opbeat_register_handlers()
         {%- endif %}