Simpler run/wsgi

run:
 * no longer require half of the codebase, it's about starting gunicorn
 * no need for gevent monkey patching (gunicorn gives this)

wsgi:
 * no longer depends on run
 * monkeypatch only if we need it
 * search is now conditionnally inserted, like the other index endpoints
 * debug and log levels are more consistently used

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

Author: Olivier Gambier

docker_registry/run.py

@@ -2,31 +2,14 @@
 
 from __future__ import print_function
 
-# this must happen before anything else
-import gevent.monkey
-gevent.monkey.patch_all()
-
-from argparse import ArgumentParser  # noqa
-from argparse import RawTextHelpFormatter  # noqa
-
+import argparse
 import distutils.spawn
 import getpass
 import logging
 import os
 import sys
 
-from .app import app  # noqa
-from .tags import *  # noqa
-from .images import *  # noqa
-from .lib import config
 from .server import env
-from .status import *  # noqa
-from .search import *  # noqa
-
-cfg = config.load()
-if cfg.standalone:
-    # If standalone mode is enabled, load the fake Index routes
-    from .index import *  # noqa
 
 
 logger = logging.getLogger(__name__)
@@ -54,8 +37,9 @@ def run_gunicorn():
     """
 
     # this only exists to provide help/usage text
-    parser = ArgumentParser(description=DESCRIPTION,
-                            formatter_class=RawTextHelpFormatter)
+    parser = argparse.ArgumentParser(
+        description=DESCRIPTION,
+        formatter_class=argparse.RawTextHelpFormatter)
     parser.parse_args()
 
     gunicorn_path = distutils.spawn.find_executable('gunicorn')

docker_registry/wsgi.py

@@ -1,29 +1,49 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import logging
+# only needed if not using gunicorn gevent
+if __name__ == '__main__':
+    import gevent.monkey
+    gevent.monkey.patch_all()
 
+# start new relic if instructed to do so
 from .extras import newrelic
 from .server import env
 newrelic.boot(env.source('NEW_RELIC_INI'), env.source('NEW_RELIC_STAGE'))
 
 from .extensions import factory
 factory.boot()
-from .run import app
+
+import logging
+
+from .app import app  # noqa
+from .tags import *  # noqa
+from .images import *  # noqa
+from .lib import config
+
+cfg = config.load()
+
+if cfg.search_backend:
+    from .search import *  # noqa
+
+if cfg.standalone:
+    # If standalone mode is enabled, load the fake Index routes
+    from .index import *  # noqa
 
 if __name__ == '__main__':
-    # Bind to PORT if defined, otherwise default to 5000.
     host = env.source('REGISTRY_HOST')
     port = env.source('REGISTRY_PORT')
-    app.debug = True
+    app.debug = cfg.debug
     app.run(host=host, port=port)
 else:
-    # For uwsgi
-    app.logger.setLevel(logging.INFO)
+    level = cfg.loglevel.upper()
+    if not hasattr(logging, level):
+        level = 'INFO'
+    level = getattr(logging, level)
+    app.logger.setLevel(level)
     stderr_logger = logging.StreamHandler()
-    stderr_logger.setLevel(logging.INFO)
+    stderr_logger.setLevel(level)
     stderr_logger.setFormatter(
         logging.Formatter('%(asctime)s %(levelname)s: %(message)s'))
     app.logger.addHandler(stderr_logger)
-
     application = app