Enhance config error reporting and fixes #44

Author: dmp42

docker_registry/app.py

@@ -13,6 +13,8 @@
 from . import toolkit
 from .lib import config
 
+from .lib.core.exceptions import ConfigError
+
 
 VERSION = '0.6.8'
 app = flask.Flask('docker-registry')
@@ -46,7 +48,7 @@ def after_request(response):
 def init():
     # Configure the secret key
     if not cfg.secret_key:
-        raise RuntimeError('Config error: `secret_key\' is not set')
+        raise ConfigError('`secret_key\' is not set')
     app.secret_key = cfg.secret_key
     # Configure the email exceptions
     info = cfg.email_exceptions

docker_registry/lib/config.py

@@ -3,6 +3,8 @@
 import rsa
 import yaml
 
+from .core.exceptions import FileNotFoundError, ConfigError
+
 
 class Config(object):
 
@@ -56,15 +58,35 @@ def load():
     if not os.path.isabs(config_path):
         config_path = os.path.join(os.path.dirname(__file__), '../../',
                                    'config', config_path)
-    with open(config_path) as f:
+    try:
+        f = open(config_path)
+    except:
+        raise FileNotFoundError(
+            'Heads-up! File is missing: %s' % config_path)
+
+    try:
         data = yaml.load(f)
+    except:
+        raise ConfigError(
+            'Config file (%s) is not valid yaml' % config_path)
+
     config = data.get('common', {})
     flavor = os.environ.get('SETTINGS_FLAVOR', 'dev')
     config.update(data.get(flavor, {}))
     config['flavor'] = flavor
     config = convert_env_vars(config)
     if 'privileged_key' in config:
-        with open(config['privileged_key']) as f:
+        try:
+            f = open(config['privileged_key'])
+        except:
+            raise FileNotFoundError(
+                'Heads-up! File is missing: %s' % config['privileged_key'])
+
+        try:
             config['privileged_key'] = rsa.PublicKey.load_pkcs1(f.read())
+        except:
+            raise ConfigError(
+                'Key at %s is not a valid RSA key' % config['privileged_key'])
+
     _config = Config(config)
     return _config