Merge lp:~mpontillo/maas/log-cleanup--bug-1629402 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Reformat neighbour discovery logging to use only a single line, to make it less obtrusive when looking for tracebacks.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/provisioningserver/utils/services.py'
--- src/provisioningserver/utils/services.py	2016-09-26 12:46:13 +0000
+++ src/provisioningserver/utils/services.py	2016-09-30 17:56:00 +0000
@@ -15,7 +15,6 @@
 import json
 from json.decoder import JSONDecodeError
 import os
-from pprint import pformat
 import re
 
 from provisioningserver.config import is_dev_environment
@@ -542,8 +541,7 @@
         # If the monitoring state has changed, we need to potentially start
         # or stop some services.
         if self._monitoring_state != monitoring_state:
-            state = pformat(monitoring_state)
-            log.msg("New interface monitoring state: \n%s" % state)
+            log.msg("New interface monitoring state: %r" % monitoring_state)
             self._configureNeighbourDiscovery(interfaces, monitoring_state)
             self._configureMDNS(monitoring_state)
             self._monitoring_state = monitoring_state
@@ -575,13 +573,13 @@
         new_interfaces = monitored_interfaces.difference(self._monitored)
         deleted_interfaces = self._monitored.difference(monitored_interfaces)
         if len(new_interfaces) > 0:
-            log.msg("Starting neighbour discovery for interfaces: %s" % (
-                pformat(new_interfaces)))
+            log.msg("Starting neighbour discovery for interfaces: %r" % (
+                new_interfaces))
             self._startNeighbourDiscoveryServices(new_interfaces)
         if len(deleted_interfaces) > 0:
             log.msg(
-                "Stopping neighbour discovery for interfaces: %s" % (
-                    pformat(deleted_interfaces)))
+                "Stopping neighbour discovery for interfaces: %r" % (
+                    deleted_interfaces))
             self._stopNeighbourDiscoveryServices(deleted_interfaces)
         self._monitored = monitored_interfaces