Merge "Pass CONF to logging setup"

This commit is contained in:
Jenkins 2015-10-18 11:08:09 +00:00 committed by Gerrit Code Review
commit e6654d3481
1 changed files with 1 additions and 1 deletions

View File

@ -707,7 +707,7 @@ def main():
sys.exit("ERROR: %s" % encodeutils.exception_to_unicode(e))
# Setup logging
logging.setup('glance')
logging.setup(CONF, 'glance')
if CONF.token:
CONF.slavetoken = CONF.token