Move bugsnag and newrelic code

... away from the main source to the extras subfolder

Docker-DCO-1.1-Signed-off-by: Olivier Gambier <[email protected]> (github: dmp42)

Author: Olivier Gambier

docker_registry/app.py

@@ -2,11 +2,11 @@
 
 import logging
 import logging.handlers
-import os
 import platform
 import sys
 
 from . import toolkit
+from .extras import bugsnag
 from .lib import config
 from .server import __version__
 import flask
@@ -59,22 +59,6 @@ def root():
     return toolkit.response(cfg.issue)
 
 
-def bugsnag(application, api_key, flavor, version):
-    # Configure bugsnag
-    if api_key:
-        import bugsnag
-        import bugsnag.flask
-
-        root_path = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-        bugsnag.configure(api_key=api_key,
-                          project_root=root_path,
-                          release_stage=flavor,
-                          notify_release_stages=[flavor],
-                          app_version=version
-                          )
-        bugsnag.flask.handle_exceptions(application)
-
-
 def init():
     # Configure the email exceptions
     info = cfg.email_exceptions
@@ -95,7 +79,7 @@ def init():
             secure=secure_args)
         mail_handler.setLevel(logging.ERROR)
         app.logger.addHandler(mail_handler)
-    bugsnag(app, cfg.bugsnag, cfg.flavor, __version__)
+    bugsnag.boot(app, cfg.bugsnag, cfg.flavor, __version__)
     # Configure flask_cors
     for i in cfg.cors.keys():
         app.config['CORS_%s' % i.upper()] = cfg.cors[i]

docker_registry/extras/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+
+def boot(application, api_key, flavor, version):
+    # Configure bugsnag
+    if api_key:
+        import bugsnag
+        import bugsnag.flask
+
+        root_path = os.path.abspath(
+            os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
+        bugsnag.configure(api_key=api_key,
+                          project_root=root_path,
+                          release_stage=flavor,
+                          notify_release_stages=[flavor],
+                          app_version=version
+                          )
+        bugsnag.flask.handle_exceptions(application)

docker_registry/extras/bugsnag.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+
+def boot(ini, stage):
+    if ini:
+        try:
+            import newrelic.agent
+            newrelic.agent.initialize(ini, stage)
+        except Exception as e:
+            raise Exception('Failed to init new relic agent %s' % e)

docker_registry/extras/newrelic.py

@@ -3,17 +3,9 @@
 
 import logging
 
+from .extras import newrelic
 from .server import env
-
-_new_relic_ini = env.source('NEW_RELIC_INI')
-if _new_relic_ini:
-    try:
-        import newrelic.agent
-        newrelic.agent.initialize(
-            _new_relic_ini,
-            env.source('NEW_RELIC_STAGE'))
-    except Exception as e:
-        raise(Exception('Failed to init new relic agent %s' % e))
+newrelic.boot(env.source('NEW_RELIC_INI'), env.source('NEW_RELIC_STAGE'))
 
 from .extensions import factory
 factory.boot()