summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-04 07:19:38 +0000
committerGerrit Code Review <review@openstack.org>2012-08-04 07:19:38 +0000
commitff9578da2d042ba3d6cb7b6ded76de74c0754689 (patch)
tree58d77b37c7c5e4cf2157c0b75c1412f8e7d856ed
parent4c79d9b9641477014388c87ab3bcc645596a4dc4 (diff)
parent997fc59c4783b8c8dfe334bf0513169ec6126efb (diff)
downloadnova-ff9578da2d042ba3d6cb7b6ded76de74c0754689.tar.gz
nova-ff9578da2d042ba3d6cb7b6ded76de74c0754689.tar.xz
nova-ff9578da2d042ba3d6cb7b6ded76de74c0754689.zip
Merge "Sync w/ latest openstack common log.py."
-rw-r--r--nova/openstack/common/log.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/nova/openstack/common/log.py b/nova/openstack/common/log.py
index eac2a8ac8..250b10501 100644
--- a/nova/openstack/common/log.py
+++ b/nova/openstack/common/log.py
@@ -357,17 +357,6 @@ def _setup_logging_from_conf(product_name):
for handler in log_root.handlers:
logger.addHandler(handler)
- # NOTE(jkoelker) Clear the handlers for the root logger that was setup
- # by basicConfig in nova/__init__.py and install the
- # NullHandler.
- root = logging.getLogger()
- for handler in root.handlers:
- root.removeHandler(handler)
- handler = NullHandler()
- handler.setFormatter(logging.Formatter())
- root.addHandler(handler)
-
-
_loggers = {}