openstack/ironic
Code Issues Proposed changes

Only call getLogger after configuring logging.

Browse Source 
Logging needs to be setup properly before we try to log
something. Fix a test case that loads the code but does
not execute the code that results in the LOG being setup
properly.

Fixes LP# 1161031

Change-Id: I9d5bc6b87cfb25243f00e17b532d4485dc4454e4
This commit is contained in:
Davanum Srinivas
2013-04-04 17:33:20 -04:00
parent f5d9ded9c4
commit 832fca9615
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/cmd/baremetal_deploy_helper.py
View File

@@ -39,8 +39,6 @@ from nova.virt.baremetal import baremetal_states
from nova.virt.baremetal import db from nova.virt.baremetal import db
LOG = logging.getLogger('nova.virt.baremetal.deploy_helper')
QUEUE = Queue.Queue() QUEUE = Queue.Queue()
@@ -315,6 +313,7 @@ class BareMetalDeploy(object):
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup("nova")
LOG = logging.getLogger('nova.virt.baremetal.deploy_helper')
app = BareMetalDeploy() app = BareMetalDeploy()
srv = simple_server.make_server('', 10000, app) srv = simple_server.make_server('', 10000, app)
srv.serve_forever() srv.serve_forever()

3
nova/tests/baremetal/test_nova_baremetal_deploy_helper.py
View File

@@ -23,10 +23,13 @@ import time
import mox import mox
from nova.cmd import baremetal_deploy_helper as bmdh from nova.cmd import baremetal_deploy_helper as bmdh
from nova.openstack.common import log as logging
from nova import test from nova import test
from nova.tests.baremetal.db import base as bm_db_base from nova.tests.baremetal.db import base as bm_db_base
from nova.virt.baremetal import db as bm_db from nova.virt.baremetal import db as bm_db
bmdh.LOG = logging.getLogger('nova.virt.baremetal.deploy_helper')
_PXECONF_DEPLOY = """ _PXECONF_DEPLOY = """
default deploy default deploy