openstack/heat
Code Issues Proposed changes

Merge "passed version information while parsing arguments"

Browse Source
This commit is contained in:
Jenkins 2015-03-24 04:00:18 +00:00 committed by Gerrit Code Review
commit 068d6bd3df
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/heat-api
View File

@ -41,6 +41,7 @@ from heat.common import messaging
from heat.common import profiler
from heat.common import wsgi
from heat.openstack.common import systemd
from heat import version
i18n.enable_lazy()
@ -49,7 +50,8 @@ LOG = logging.getLogger('heat.api')
if __name__ == '__main__':
try:
logging.register_options(cfg.CONF)
cfg.CONF(project='heat', prog='heat-api')
version = version.version_info.version_string()
cfg.CONF(project='heat', prog='heat-api', version=version)
logging.setup(cfg.CONF, 'heat-api')
logging.set_defaults()
messaging.setup()

4
bin/heat-engine
View File

@ -43,6 +43,7 @@ from heat.common import profiler
from heat.engine import template
from heat.openstack.common import service
from heat.rpc import api as rpc_api
from heat import version
i18n.enable_lazy()
@ -50,7 +51,8 @@ LOG = logging.getLogger('heat.engine')
if __name__ == '__main__':
logging.register_options(cfg.CONF)
cfg.CONF(project='heat', prog='heat-engine')
version = version.version_info.version_string()
cfg.CONF(project='heat', prog='heat-engine', version=version)
logging.setup(cfg.CONF, 'heat-engine')
logging.set_defaults()
messaging.setup()