Merge lp:~allenap/maas/packaging.normalise-logging--bug-1639182--yakkety--2.1 into lp:~maas-maintainers/maas/packaging-2.1

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: 538
Merged at revision: 538
Proposed branch: lp:~allenap/maas/packaging.normalise-logging--bug-1639182--yakkety--2.1
Merge into: lp:~maas-maintainers/maas/packaging-2.1
Diff against target: 35 lines (+7/-4)
2 files modified
debian/maas-rack-controller.maas-rackd.service (+3/-2)
debian/maas-region-api.maas-regiond-worker@.service (+4/-2)
To merge this branch: bzr merge lp:~allenap/maas/packaging.normalise-logging--bug-1639182--yakkety--2.1
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+312041@code.launchpad.net

Commit message

Backport r536 from trunk: Use a custom logger when invoking twistd3.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

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

Backport so self-reviewing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-rack-controller.maas-rackd.service'
2--- debian/maas-rack-controller.maas-rackd.service 2016-03-31 21:53:56 +0000
3+++ debian/maas-rack-controller.maas-rackd.service 2016-11-29 12:44:22 +0000
4@@ -18,10 +18,11 @@
5 # Logs go to the journal; read them with
6 # journalctl -u maas-rackd
7 # Logs also go to $LOGFILE for backward compatibility. The journal
8-# should now be preferred as the $LOGFILE will be removed in MAAS 1.9.
9+# should now be preferred as the $LOGFILE will be removed.
10 ExecStart=/bin/sh -c \
11 'exec /usr/bin/authbind --deep /usr/bin/twistd3 --nodaemon --pidfile= \
12- maas-rackd 2>&1 | tee -a $LOGFILE'
13+ --logger=provisioningserver.logger.EventLogger maas-rackd 2>&1 | \
14+ tee -a $LOGFILE'
15
16 [Install]
17 WantedBy=multi-user.target
18
19=== modified file 'debian/maas-region-api.maas-regiond-worker@.service'
20--- debian/maas-region-api.maas-regiond-worker@.service 2016-03-31 21:53:56 +0000
21+++ debian/maas-region-api.maas-regiond-worker@.service 2016-11-29 12:44:22 +0000
22@@ -19,9 +19,11 @@
23 # Logs go to the journal; read them with:
24 # journalctl -u maas-regiond-worker@*
25 # Logs also go to $LOGFILE for backward compatibility. The journal
26-# should now be preferred as $LOGFILE will be removed in MAAS 1.9.
27+# should now be preferred as $LOGFILE will be removed.
28 ExecStart=/bin/sh -c \
29- 'exec twistd3 --nodaemon --pidfile= maas-regiond 2>&1 | tee -a $LOGFILE'
30+ 'exec twistd3 --nodaemon --pidfile= \
31+ --logger=provisioningserver.logger.EventLogger maas-regiond 2>&1 | \
32+ tee -a $LOGFILE'
33
34 [Install]
35 WantedBy=maas-regiond.service

Subscribers

People subscribed via source and target branches