Ensure good app registry for buildbot and wsgi

mozilla · Jul 7, 2016 · e58e584 · e58e584
1 parent 7e9ed2c
commit e58e584
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bb2mbdb/status.py b/bb2mbdb/status.py
@@ -49,6 +49,9 @@ def setupBridge(master, settings, config):
     if settings is not None:
         os.environ['DJANGO_SETTINGS_MODULE'] = settings
 
+    import django
+    django.setup()
+
     import bb2mbdb.utils
     reload(bb2mbdb.utils)
     import mbdb.models

diff --git a/wsgi/elmo.wsgi b/wsgi/elmo.wsgi
@@ -29,7 +29,6 @@ sys.path[:0] = new_sys_path
 # manage prepends /apps, /vendor and /vendor-local to sys.path on its own
 import manage
 
-
-import django.core.handlers.wsgi
 os.environ['DJANGO_SETTINGS_MODULE'] = 'elmo.settings'
-application = django.core.handlers.wsgi.WSGIHandler()
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()