Merge pull request #638 from gregburek/bugsnag

Do not use conflicting module names for bugsnag or newrelic

Author: dmp42

docker_registry/app.py

@@ -6,8 +6,8 @@
 import sys
 
 from . import toolkit
-from .extras import bugsnag
 from .extras import cors
+from .extras import ebugsnag
 from .lib import config
 from .server import __version__
 import flask
@@ -80,7 +80,7 @@ def init():
         mail_handler.setLevel(logging.ERROR)
         app.logger.addHandler(mail_handler)
     # Optional bugsnag support
-    bugsnag.boot(app, cfg.bugsnag, cfg.flavor, __version__)
+    ebugsnag.boot(app, cfg.bugsnag, cfg.flavor, __version__)
     # Optional cors support
     cors.boot(app, cfg.cors)
 

docker_registry/extras/bugsnag.py renamed to docker_registry/extras/ebugsnag.py

@@ -8,10 +8,10 @@
 
 # start new relic if instructed to do so
 from .extensions import factory
-from .extras import newrelic
+from .extras import enewrelic
 from .server import env
-newrelic.boot(env.source('NEW_RELIC_CONFIG_FILE'),
-              env.source('NEW_RELIC_LICENSE_KEY'))
+enewrelic.boot(env.source('NEW_RELIC_CONFIG_FILE'),
+               env.source('NEW_RELIC_LICENSE_KEY'))
 factory.boot()
 
 import logging