From 4364dc8edea32a3fbdc6d7f4e15de8a5b692218a Mon Sep 17 00:00:00 2001 From: Griatch Date: Wed, 12 Feb 2020 23:43:01 +0100 Subject: [PATCH] Do not try to log partial binary data content, see #2053 --- evennia/server/portal/amp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py index 4a96da9f25..0d4924a540 100644 --- a/evennia/server/portal/amp.py +++ b/evennia/server/portal/amp.py @@ -314,7 +314,7 @@ class AMPMultiConnectionProtocol(amp.AMP): try: super(AMPMultiConnectionProtocol, self).dataReceived(data) except KeyError: - _get_logger().log_trace("Discarded incoming partial data: {}".format(to_str(data))) + _get_logger().log_trace("Discarded incoming partial (packed) data (len {})".format(len(data))) elif self.multibatches: # invalid AMP, but we have a pending multi-batch that is not yet complete if data[-2:] == NULNUL: @@ -323,7 +323,7 @@ class AMPMultiConnectionProtocol(amp.AMP): try: super(AMPMultiConnectionProtocol, self).dataReceived(data) except KeyError: - _get_logger().log_trace("Discarded incoming multi-batch data:".format(to_str(data))) + _get_logger().log_trace("Discarded incoming multi-batch (packed) data (len {})".format(len(data))) else: # not an AMP communication, return warning self.transport.write(_HTTP_WARNING)