@@ -, +, @@ --- bin/glance-api.py | 2 +- bin/glance-registry.py | 3 ++- glance/common/config.py | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) --- a/bin/glance-api +++ a/bin/glance-api @@ -61,7 +61,7 @@ if __name__ == '__main__': glance.store.verify_default_store() server = wsgi.Server() - server.start(config.load_paste_app(), default_port=9292) + server.start(config.load_paste_app('glance-api'), default_port=9292) server.wait() except exception.WorkerCreationFailure as e: fail(2, e) --- a/bin/glance-registry +++ a/bin/glance-registry @@ -51,7 +51,8 @@ if __name__ == '__main__': log.setup('glance') server = wsgi.Server() - server.start(config.load_paste_app(), default_port=9191) + server.start(config.load_paste_app('glance-registry'), + default_port=9191) server.wait() except RuntimeError as e: sys.exit("ERROR: %s" % e) --- a/glance/common/config.py +++ a/glance/common/config.py @@ -183,7 +183,7 @@ def _get_deployment_config_file(): return os.path.abspath(path) -def load_paste_app(app_name=None): +def load_paste_app(app_name): """ Builds and returns a WSGI app from a paste config file. @@ -195,9 +195,6 @@ def load_paste_app(app_name=None): :raises RuntimeError when config file cannot be located or application cannot be loaded from config file """ - if app_name is None: - app_name = CONF.prog - # append the deployment flavor to the application name, # in order to identify the appropriate paste pipeline app_name += _get_deployment_flavor() --