From b295fde8019b60242a7e675eb7c4f448acf2fceb Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Tue, 28 Feb 2017 18:35:16 +0000 Subject: [PATCH] Revert "Turn off propagation for undercloud logger" This broke logging to a file. Closes-Bug: 1668709 This reverts commit e28f501142c9e12b28eb59b26559ae682b547966. Change-Id: Ie085c44ceca1cf3ba62b9afbd7ee927218805ed9 --- instack_undercloud/tests/test_undercloud.py | 4 ---- instack_undercloud/undercloud.py | 1 - 2 files changed, 5 deletions(-) diff --git a/instack_undercloud/tests/test_undercloud.py b/instack_undercloud/tests/test_undercloud.py index 6215eb9de..fa0b77bbb 100644 --- a/instack_undercloud/tests/test_undercloud.py +++ b/instack_undercloud/tests/test_undercloud.py @@ -39,10 +39,6 @@ class BaseTestCase(base.BaseTestCase): def setUp(self): super(BaseTestCase, self).setUp() self.logger = self.useFixture(log.ConfigureLogging()).logger - # Otherwise our test logger doesn't see the log messages - self.useFixture( - fixtures.MockPatch('instack_undercloud.undercloud.LOG.propagate', - True)) class TestUndercloud(BaseTestCase): diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index cd7eb680b..23d46a6d6 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -501,7 +501,6 @@ def _configure_logging(level, filename): formatter = logging.Formatter(DEFAULT_LOG_FORMAT) handler.setFormatter(formatter) LOG.addHandler(handler) - LOG.propagate = False def _load_config():