Attachment #352356 for bug #474064

Lines 53-59 if __name__ == '__main__': Link Here

(-)a/bin/glance-api (-1 / +1 lines)
53	log.setup('glance')	53	log.setup('glance')
54		54
55	server = wsgi.Server()	55	server = wsgi.Server()
56	server.start(config.load_paste_app, default_port=9292)	56	server.start(config.load_paste_app('glance-api'), default_port=9292)
57	server.wait()	57	server.wait()
58	except exception.WorkerCreationFailure as e:	58	except exception.WorkerCreationFailure as e:
59	fail(2, e)	59	fail(2, e)

Lines 47-53 if __name__ == '__main__': Link Here

(-)a/bin/glance-registry (-1 / +2 lines)
47	log.setup('glance')	47	log.setup('glance')
48		48
49	server = wsgi.Server()	49	server = wsgi.Server()
50	server.start(config.load_paste_app, default_port=9191)	50	server.start(config.load_paste_app('glance-registry'),
		51	default_port=9191)
51	server.wait()	52	server.wait()
52	except RuntimeError as e:	53	except RuntimeError as e:
53	sys.exit("ERROR: %s" % e)	54	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 158-164 def _get_deployment_config_file(): Link Here

(-)a/glance/common/config.py (-5 / +1 lines)
158	return os.path.abspath(path)	158	return os.path.abspath(path)
159		159
160		160
161	def load_paste_app(app_name=None):	161	def load_paste_app(app_name):
162	"""	162	"""
163	Builds and returns a WSGI app from a paste config file.	163	Builds and returns a WSGI app from a paste config file.
164		164
Lines 170-178 def load_paste_app(app_name=None): Link Here
170	:raises RuntimeError when config file cannot be located or application	170	:raises RuntimeError when config file cannot be located or application
171	cannot be loaded from config file	171	cannot be loaded from config file
172	"""	172	"""
173	if app_name is None:
174	app_name = CONF.prog
175
176	# append the deployment flavor to the application name,	173	# append the deployment flavor to the application name,
177	# in order to identify the appropriate paste pipeline	174	# in order to identify the appropriate paste pipeline
178	app_name += _get_deployment_flavor()	175	app_name += _get_deployment_flavor()
179	-