Merge lp:~newell-jensen/maas/fix-1592885 into lp:~maas-committers/maas/trunk

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 5139
Proposed branch: lp:~newell-jensen/maas/fix-1592885
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 54 lines (+12/-1)
2 files modified
src/provisioningserver/plugin.py (+6/-0)
src/provisioningserver/tests/test_plugin.py (+6/-1)
To merge this branch: bzr merge lp:~newell-jensen/maas/fix-1592885
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+298070@code.launchpad.net

Commit message

The region service is using logger.basicConfig for setting the log messags. This branch updates the rack service to use the same setup as the region service so that we can get consistent messaging between the two.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Since maas.log is generated from syslog, we are leaving that one as it currently is.

Revision history for this message
Gavin Panella (allenap) wrote :

Tip top!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/plugin.py'
--- src/provisioningserver/plugin.py 2016-06-03 17:34:13 +0000
+++ src/provisioningserver/plugin.py 2016-06-21 21:29:22 +0000
@@ -170,12 +170,18 @@
170 import crochet170 import crochet
171 crochet.no_setup()171 crochet.no_setup()
172172
173 def _configureLogging(self):
174 # Get something going with the logs.
175 from provisioningserver import logger
176 logger.basicConfig()
177
173 def makeService(self, options):178 def makeService(self, options):
174 """Construct the MAAS Cluster service."""179 """Construct the MAAS Cluster service."""
175 register_sigusr2_thread_dump_handler()180 register_sigusr2_thread_dump_handler()
176 add_term_error_code_to_tftp()181 add_term_error_code_to_tftp()
177182
178 self._configureCrochet()183 self._configureCrochet()
184 self._configureLogging()
179185
180 with ClusterConfiguration.open() as config:186 with ClusterConfiguration.open() as config:
181 tftp_root = config.tftp_root187 tftp_root = config.tftp_root
182188
=== modified file 'src/provisioningserver/tests/test_plugin.py'
--- src/provisioningserver/tests/test_plugin.py 2016-06-03 17:34:13 +0000
+++ src/provisioningserver/tests/test_plugin.py 2016-06-21 21:29:22 +0000
@@ -12,7 +12,10 @@
12 MAASTwistedRunTest,12 MAASTwistedRunTest,
13)13)
14import provisioningserver14import provisioningserver
15from provisioningserver import plugin as plugin_module15from provisioningserver import (
16 logger,
17 plugin as plugin_module,
18)
16from provisioningserver.config import ClusterConfiguration19from provisioningserver.config import ClusterConfiguration
17from provisioningserver.plugin import (20from provisioningserver.plugin import (
18 Options,21 Options,
@@ -78,6 +81,7 @@
78 self.useFixture(ClusterConfigurationFixture())81 self.useFixture(ClusterConfigurationFixture())
79 self.patch(provisioningserver, "services", MultiService())82 self.patch(provisioningserver, "services", MultiService())
80 self.patch_autospec(crochet, "no_setup")83 self.patch_autospec(crochet, "no_setup")
84 self.patch_autospec(logger, "basicConfig")
81 self.tempdir = self.make_dir()85 self.tempdir = self.make_dir()
8286
83 def test_init(self):87 def test_init(self):
@@ -104,6 +108,7 @@
104 "Not all services are named.")108 "Not all services are named.")
105 self.assertEqual(service, provisioningserver.services)109 self.assertEqual(service, provisioningserver.services)
106 self.assertThat(crochet.no_setup, MockCalledOnceWith())110 self.assertThat(crochet.no_setup, MockCalledOnceWith())
111 self.assertThat(logger.basicConfig, MockCalledOnceWith())
107112
108 def test_makeService_patches_tftp_service(self):113 def test_makeService_patches_tftp_service(self):
109 mock_tftp_patch = (114 mock_tftp_patch = (