Fix config handling

Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com> (github: samalba) Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com> (github: dmp42)
HuKeping · Jun 13, 2014 · a8016be · a8016be
1 parent b6aa61f
commit a8016be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docker_registry/app.py b/docker_registry/app.py
@@ -26,7 +26,7 @@
 @app.route('/_ping')
 @app.route('/v1/_ping')
 def ping():
-    headers = {'X-Docker-Registry-Standalone': cfg.standalone is not False}
+    headers = {'X-Docker-Registry-Standalone': cfg.standalone is True}
     if cfg.mirroring:
         headers['X-Docker-Registry-Standalone'] = 'mirror'
     return toolkit.response(headers=headers)

diff --git a/docker_registry/images.py b/docker_registry/images.py
@@ -344,7 +344,7 @@ def get_image_ancestry(image_id, headers):
 
 
 def check_images_list(image_id):
-    if cfg.disable_token_auth is True or cfg.standalone is not False:
+    if cfg.disable_token_auth is True or cfg.standalone is True:
         # We enforce the check only when auth is enabled so we have a token.
         return True
     repository = toolkit.get_repository()

diff --git a/docker_registry/run.py b/docker_registry/run.py
@@ -20,7 +20,7 @@
 from .search import *  # noqa
 
 cfg = config.load()
-if cfg.standalone is not False:
+if cfg.standalone is True:
     # If standalone mode is enabled (default), load the fake Index routes
     from .index import *  # noqa
 

diff --git a/docker_registry/toolkit.py b/docker_registry/toolkit.py
@@ -101,7 +101,7 @@ def response(data=None, code=200, headers=None, raw=False):
 
 def validate_parent_access(parent_id):
     cfg = config.load()
-    if cfg.standalone is not False:
+    if cfg.standalone is True:
         return True
     auth = _parse_auth_header()
     if not auth:
@@ -191,10 +191,10 @@ def _parse_auth_header():
 
 
 def check_token(args):
+    logger.debug('args = {0}'.format(args))
     cfg = config.load()
-    if cfg.disable_token_auth is True or cfg.standalone is not False:
+    if cfg.disable_token_auth is True or cfg.standalone is True:
         return True
-    logger.debug('args = {0}'.format(args))
     auth = _parse_auth_header()
     if not auth:
         return False