Attachment #352354 for bug #474064

Lines 61-67 if __name__ == '__main__': Link Here

(-)a/bin/glance-api (-1 / +1 lines)
61	glance.store.verify_default_store()	61	glance.store.verify_default_store()
62		62
63	server = wsgi.Server()	63	server = wsgi.Server()
64	server.start(config.load_paste_app(), default_port=9292)	64	server.start(config.load_paste_app('glance-api'), default_port=9292)
65	server.wait()	65	server.wait()
66	except exception.WorkerCreationFailure as e:	66	except exception.WorkerCreationFailure as e:
67	fail(2, e)	67	fail(2, e)

Lines 51-57 if __name__ == '__main__': Link Here

(-)a/bin/glance-registry (-1 / +2 lines)
51	log.setup('glance')	51	log.setup('glance')
52		52
53	server = wsgi.Server()	53	server = wsgi.Server()
54	server.start(config.load_paste_app(), default_port=9191)	54	server.start(config.load_paste_app('glance-registry'),
		55	default_port=9191)
55	server.wait()	56	server.wait()
56	except RuntimeError as e:	57	except RuntimeError as e:
57	sys.exit("ERROR: %s" % e)	58	sys.exit("ERROR: %s" % e)




    return os.path.abspath(path)


def load_paste_app(app_name):
    """
    Builds and returns a WSGI app from a paste config file.


    :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()
- 

Return to bug 474064

Lines 183-189 def _get_deployment_config_file(): Link Here

(-)a/glance/common/config.py (-5 / +1 lines)
183	return os.path.abspath(path)	183	return os.path.abspath(path)
184		184
185		185
186	def load_paste_app(app_name=None):	186	def load_paste_app(app_name):
187	"""	187	"""
188	Builds and returns a WSGI app from a paste config file.	188	Builds and returns a WSGI app from a paste config file.
189		189
Lines 195-203 def load_paste_app(app_name=None): Link Here
195	:raises RuntimeError when config file cannot be located or application	195	:raises RuntimeError when config file cannot be located or application
196	cannot be loaded from config file	196	cannot be loaded from config file
197	"""	197	"""
198	if app_name is None:
199	app_name = CONF.prog
200
201	# append the deployment flavor to the application name,	198	# append the deployment flavor to the application name,
202	# in order to identify the appropriate paste pipeline	199	# in order to identify the appropriate paste pipeline
203	app_name += _get_deployment_flavor()	200	app_name += _get_deployment_flavor()
204	-