From af8cffd5aa93dd0eaf58e6b9814cf6edba5b468c Mon Sep 17 00:00:00 2001 From: PhilipTrauner Date: Sun, 3 Apr 2016 22:35:00 +0200 Subject: [PATCH] Added data truncation and length constant (currently independent of actual length) --- Shared/ESock.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Shared/ESock.py b/Shared/ESock.py index 32ddd47..3dbe180 100644 --- a/Shared/ESock.py +++ b/Shared/ESock.py @@ -4,6 +4,8 @@ import struct import DataTypes import Logging +MAX_ROUTE_LENGTH = 16 + class ConvertFailedError(ValueError): def __init__(self): super(ValueError, self).__init__("conversion failed (false data type supplied)") @@ -76,7 +78,10 @@ class ESock: self._sock.close() return None, "" if self.debug: - Logging.info("Received %d-long '%s' on route '%s': %s (%s:%d)" % (len(data), type(data).__name__, route, str(data).replace("\n", " "), self.address, self.port)) + data_repr = str(data).replace("\n", " ") + if len(data_repr) > 80: + data_repr = data_repr[:80] + "..." + Logging.info("Received %d-long '%s' on route '%s': %s (%s:%d)" % (len(data), type(data).__name__, route, data_repr, self.address, self.port)) return data, route @@ -84,7 +89,10 @@ class ESock: length = len(data) original_data_type = type(data) if self.debug: - Logging.info("Sending %d-long '%s' on route '%s': %s (%s:%d)" % (length, original_data_type.__name__, route, str(data).replace("\n", " "), self.address, self.port)) + data_repr = str(data).replace("\n", " ") + if len(data_repr) > 80: + data_repr = data_repr[:80] + "..." + Logging.info("Sending %d-long '%s' on route '%s': %s (%s:%d)" % (length, original_data_type.__name__, route, data_repr, self.address, self.port)) route = route.encode() if original_data_type in ESock.DATA_TYPES: data_type = ESock.DATA_TYPES[original_data_type]