Fixing logging import for barbican-worker.py

Change-Id: Idd0eda55f996200c4d3fe07243d45a7f5528f3bd
Closes-Bug: 1424299
This commit is contained in:
John Vrbanac 2015-02-21 18:59:32 -06:00
parent 2a95e156aa
commit b20b70c173

View File

@ -37,11 +37,12 @@ if os.path.exists(os.path.join(possible_topdir, 'barbican', '__init__.py')):
from barbican.common import config from barbican.common import config
from barbican.openstack.common import log
from barbican.openstack.common import service from barbican.openstack.common import service
from barbican import queue from barbican import queue
from barbican.queue import server from barbican.queue import server
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log
def fail(returncode, e): def fail(returncode, e):
@ -52,14 +53,14 @@ def fail(returncode, e):
if __name__ == '__main__': if __name__ == '__main__':
try: try:
config.parse_args() config.parse_args()
CONF = cfg.CONF
# Import and configure logging. # Import and configure logging.
log.setup('barbican') log.setup(CONF, 'barbican')
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
LOG.debug("Booting up Barbican worker node...") LOG.debug("Booting up Barbican worker node...")
# Queuing initialization # Queuing initialization
CONF = cfg.CONF
queue.init(CONF) queue.init(CONF)
service.launch( service.launch(