1
=== modified file 'contrib/maas-rsyslog.conf'
2
--- contrib/maas-rsyslog.conf	2014-07-29 10:38:32 +0000
3
+++ contrib/maas-rsyslog.conf	2015-04-14 14:38:55 +0000
4
@@ -1,2 +1,2 @@
5
1
# Log MAAS messages to their own file.
1
# Log MAAS messages to their own file.
7
2
:syslogtag,contains,"maas" /var/log/maas/maas.log
2
:syslogtag,regex,"^maas\b$" /var/log/maas/maas.log
8
3
3
9
=== modified file 'src/maas/settings.py'
10
--- src/maas/settings.py	2015-03-30 08:26:36 +0000
11
+++ src/maas/settings.py	2015-04-14 14:38:55 +0000
12
@@ -260,8 +260,13 @@
13
260
        'django.contrib.admin',
260
        'django.contrib.admin',
14
261
    )
261
    )
15
262
262
18
263
# See http://docs.djangoproject.com/en/dev/topics/logging for
263
# See http://docs.djangoproject.com/en/dev/topics/logging for more details on
19
264
# more details on how to customize the logging configuration.
264
# how to customize the logging configuration.
20
265
#
21
266
# NOTE CAREFULLY that django.utils.log.DEFAULT_LOGGING is applied *before*
22
267
# applying the configuration below. This means that you need to mentally
23
268
# combine the settings in both DEFAULT_LOGGING and LOGGING to understand the
24
269
# resultant behaviour.
25
265
LOGGING = {
270
LOGGING = {
26
266
    'version': 1,
271
    'version': 1,
27
267
    'disable_existing_loggers': False,
272
    'disable_existing_loggers': False,
28
@@ -280,26 +285,11 @@
29
280
    },
285
    },
30
281
    'root': {
286
    'root': {
31
282
        'handlers': ['stdout'],
287
        'handlers': ['stdout'],
32
288
        'level': DEFAULT_LOG_LEVEL,
33
283
    },
289
    },
34
290
    # Do *not* set any options for the `maas` logger here because config done
35
291
    # elsewhere -- by configure_root_logger() -- will be clobbered.
36
284
    'loggers': {
292
    'loggers': {
37
285
        'maas': {
38
286
            'level': DEFAULT_LOG_LEVEL,
39
287
        },
40
288
        'maasserver': {
41
289
            'level': DEFAULT_LOG_LEVEL,
42
290
        },
43
291
        'metadataserver': {
44
292
            'level': DEFAULT_LOG_LEVEL,
45
293
        },
46
294
        'django.request': {
47
295
            'level': DEFAULT_LOG_LEVEL,
48
296
        },
49
297
        'django.db.backends': {
50
298
            'level': DEFAULT_LOG_LEVEL,
51
299
        },
52
300
        'sstreams': {
53
301
            'level': DEFAULT_LOG_LEVEL,
54
302
        },
55
303
        'urllib3': {
293
        'urllib3': {
56
304
            'level': 'WARN',
294
            'level': 'WARN',
57
305
        },
295
        },
58
306
296
59
=== modified file 'src/provisioningserver/logger/log.py'
60
--- src/provisioningserver/logger/log.py	2015-03-04 23:52:02 +0000
61
+++ src/provisioningserver/logger/log.py	2015-04-14 14:38:55 +0000
62
@@ -60,11 +60,14 @@
63
60
    root = get_maas_logger()
60
    root = get_maas_logger()
64
61
    if len(root.handlers) == 0:
61
    if len(root.handlers) == 0:
65
62
        # It has not yet been configured.
62
        # It has not yet been configured.
67
63
        handler = SysLogHandler("/dev/log")
63
        handler = SysLogHandler(
68
64
            "/dev/log", facility=SysLogHandler.LOG_DAEMON)
69
64
        handler.setFormatter(logging.Formatter(
65
        handler.setFormatter(logging.Formatter(
70
65
            "%(name)s: [%(levelname)s] %(message)s"))
66
            "%(name)s: [%(levelname)s] %(message)s"))
71
66
        root.addHandler(handler)
67
        root.addHandler(handler)
72
67
        root.setLevel(logging.INFO)
68
        root.setLevel(logging.INFO)
73
69
        # Don't propagate logs up to the root logger.
74
70
        root.propagate = 0
75
68
    return root
71
    return root
76
69
72
77
70
73
78
71
74
79
=== modified file 'src/provisioningserver/tests/test_tags.py'
80
--- src/provisioningserver/tests/test_tags.py	2015-03-25 15:33:23 +0000
81
+++ src/provisioningserver/tests/test_tags.py	2015-04-14 14:38:55 +0000
82
@@ -106,7 +106,7 @@
83
106
106
84
107
    def setUp(self):
107
    def setUp(self):
85
108
        super(TestMergeDetailsCleanly, self).setUp()
108
        super(TestMergeDetailsCleanly, self).setUp()
87
109
        self.logger = self.useFixture(FakeLogger())
109
        self.logger = self.useFixture(FakeLogger("maas"))
88
110
110
89
111
    def test_merge_with_no_details(self):
111
    def test_merge_with_no_details(self):
90
112
        xml = self.do_merge_details({})
112
        xml = self.do_merge_details({})
Reviewer	Review Type	Date Requested	Status
Blake Rouse (community)		2015-01-20	Approve on 2015-04-14
Review via email: mp+247013@code.launchpad.net