Merge "Pass CONF to logging setup"
This commit is contained in:
commit
e6654d3481
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue