Merge ~mpontillo/maas:cleanup-auth-errors--bug-1792029 into maas:master

[Mike Pontillo]

LP: #1792029 - Clean up logging when rack authentication fails.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b cleanup-auth-errors--bug-1792029 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3911/console
COMMIT: f9d5e528aafd4e13b34630db6bc655e9beac59ac

review: Needs Fixing

[Newell Jensen (newell-jensen)]

+1

review: Approve

diff --git a/src/maasserver/rpc/regionservice.py b/src/maasserver/rpc/regionservice.py
index 41c9a74..d85ca9a 100644
--- a/src/maasserver/rpc/regionservice.py
+++ b/src/maasserver/rpc/regionservice.py
@@ -725,10 +725,14 @@ class RegionServer(Region):
             # logged elsewhere.
             return
         else:
-            log.err(
-                failure, "Rack controller '%s' could not be authenticated; "
-                "dropping connection." % self.ident)
-            return self.transport.loseConnection()
+            log.msg(
+                "Rack controller '%s' could not be authenticated; dropping "
+                "connection. Check that /var/lib/maas/secret on the "
+                "controller contains the correct shared key." % self.ident)
+            if self.transport is not None:
+                return self.transport.loseConnection()
+            else:
+                return
 
     def connectionMade(self):
         super(RegionServer, self).connectionMade()
diff --git a/src/maasserver/rpc/tests/test_regionservice.py b/src/maasserver/rpc/tests/test_regionservice.py
index d977586..66ac97d 100644
--- a/src/maasserver/rpc/tests/test_regionservice.py
+++ b/src/maasserver/rpc/tests/test_regionservice.py
@@ -217,9 +217,7 @@ class TestRegionServer(MAASTransactionServerTestCase):
         self.assertDocTestMatches(
             """\
             Rack controller '...' could not be authenticated; dropping
-            connection.
-            Traceback (most recent call last):...
-            """,
+            connection. Check that /var/lib/maas/secret...""",
             logger.dump())
 
     def test_handshakeFailed_does_not_log_when_connection_is_closed(self):