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

[Gavin Panella]

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

[MAAS Lander (maas-lander)]

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

[Gavin Panella (allenap)]

Backport so self-reviewing.

review: Approve

=== modified file 'debian/maas-rack-controller.maas-rackd.service'
--- debian/maas-rack-controller.maas-rackd.service	2016-03-31 21:53:56 +0000
+++ debian/maas-rack-controller.maas-rackd.service	2016-11-29 12:44:22 +0000
@@ -18,10 +18,11 @@
 # Logs go to the journal; read them with
 #   journalctl -u maas-rackd
 # Logs also go to $LOGFILE for backward compatibility. The journal
-# should now be preferred as the $LOGFILE will be removed in MAAS 1.9.
+# should now be preferred as the $LOGFILE will be removed.
 ExecStart=/bin/sh -c \
     'exec /usr/bin/authbind --deep /usr/bin/twistd3 --nodaemon --pidfile= \
-     maas-rackd 2>&1 | tee -a $LOGFILE'
+       --logger=provisioningserver.logger.EventLogger maas-rackd 2>&1 | \
+     tee -a $LOGFILE'
 
 [Install]
 WantedBy=multi-user.target
 
=== modified file 'debian/maas-region-api.maas-regiond-worker@.service'
--- debian/maas-region-api.maas-regiond-worker@.service	2016-03-31 21:53:56 +0000
+++ debian/maas-region-api.maas-regiond-worker@.service	2016-11-29 12:44:22 +0000
@@ -19,9 +19,11 @@
 # Logs go to the journal; read them with:
 #   journalctl -u maas-regiond-worker@*
 # Logs also go to $LOGFILE for backward compatibility. The journal
-# should now be preferred as $LOGFILE will be removed in MAAS 1.9.
+# should now be preferred as $LOGFILE will be removed.
 ExecStart=/bin/sh -c \
-    'exec twistd3 --nodaemon --pidfile= maas-regiond 2>&1 | tee -a $LOGFILE'
+    'exec twistd3 --nodaemon --pidfile= \
+       --logger=provisioningserver.logger.EventLogger maas-regiond 2>&1 | \
+     tee -a $LOGFILE'
 
 [Install]
 WantedBy=maas-regiond.service