sts-sponsors team mailing list archive

[Adam Collard <mp+439085@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas:no-amp-debug into maas:master.

Commit message:
Remove AMP debugging



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas/+git/maas/+merge/439085
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/src/provisioningserver/rpc/common.py b/src/provisioningserver/rpc/common.py
index 34e8183..7b296df 100644
--- a/src/provisioningserver/rpc/common.py
+++ b/src/provisioningserver/rpc/common.py
@@ -274,7 +274,6 @@ class RPCProtocol(amp.AMP):
     def _sendBoxCommand(self, command, box, requiresAnswer=True):
         """Override `_sendBoxCommand` to log the sent RPC message."""
         box[amp.COMMAND] = command
-        log.debug("[RPC -> sent] {box}", box=box)
         return super()._sendBoxCommand(
             command, box, requiresAnswer=requiresAnswer
         )
@@ -291,8 +290,6 @@ class RPCProtocol(amp.AMP):
         wrap them with :class:`amp.RemoteAmpError`. This prevents the
         disconnecting behaviour.
         """
-        log.debug("[RPC <- received] {box}", box=box)
-
         d = super().dispatchCommand(box)
 
         def coerce_error(failure):
@@ -322,27 +319,6 @@ class RPCProtocol(amp.AMP):
 
         return d.addErrback(coerce_error)
 
-    def _safeEmit(self, box):
-        """
-        Override `_safeEmit` to log the RPC response.
-        """
-        log.debug("[RPC -> responding] {box}", box=box)
-        return super()._safeEmit(box)
-
-    def _answerReceived(self, box):
-        """
-        Override `_answerRecieved` to log receiving RPC response.
-        """
-        log.debug("[RPC <- received] {box}", box=box)
-        return super()._answerReceived(box)
-
-    def _errorReceived(self, box):
-        """
-        Override `_errorReceived` to log receiving RPC response.
-        """
-        log.debug("[RPC <- error] {box}", box=box)
-        return super()._errorReceived(box)
-
     def unhandledError(self, failure):
         """Terminal errback, after application code has seen the failure.