robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Removed selective debug suppression

Browse source
This commit is contained in:
Philip Trauner 2017-04-20 17:25:02 +02:00
parent d5af3524bc
commit 7fc4a0697b
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Shared/Highway.py
View file

@ -285,7 +285,7 @@ def prepare_data(data):
class Shared: class Shared:
def setup(self, routes, debug_suppress_routes=None, debug=False): def setup(self, routes, debug=False):
self.routes = routes self.routes = routes
self.routes[META_ROUTE] = Meta() self.routes[META_ROUTE] = Meta()
self.routes = create_routes(self.routes) self.routes = create_routes(self.routes)
@ -297,10 +297,6 @@ class Shared:
# would fail during route lookup). # would fail during route lookup).
self.peer_exchange_routes = {META_ROUTE_INDEX : META_ROUTE} self.peer_exchange_routes = {META_ROUTE_INDEX : META_ROUTE}
self.peer_reverse_exchange_routes = reverse_dict(self.peer_exchange_routes) self.peer_reverse_exchange_routes = reverse_dict(self.peer_exchange_routes)
if debug_suppress_routes != None:
self.debug_suppress_routes = debug_suppress_routes
else:
self.debug_suppress_routes = []
self.debug = debug self.debug = debug
@ -330,7 +326,7 @@ class Shared:
m_route, self.address, self.port)) m_route, self.address, self.port))
return return
data = convert_data(message[METADATA_LENGTH:], data_type) data = convert_data(message[METADATA_LENGTH:], data_type)
if self.debug and route not in self.debug_suppress_routes: if self.debug:
data_repr = str(data).replace("\n", " ") data_repr = str(data).replace("\n", " ")
if len(data_repr) > 80: if len(data_repr) > 80:
data_repr = data_repr[:80] + "..." data_repr = data_repr[:80] + "..."
@ -361,7 +357,7 @@ class Shared:
except KeyError: except KeyError:
Logging.error("'%s' is not a valid peer route." % route) Logging.error("'%s' is not a valid peer route." % route)
else: else:
if self.debug and route not in self.debug_suppress_routes: if self.debug:
data_repr = str(data).replace("\n", " ") data_repr = str(data).replace("\n", " ")
if len(data_repr) > 80: if len(data_repr) > 80:
data_repr = data_repr[:80] + "..." data_repr = data_repr[:80] + "..."
@ -372,9 +368,9 @@ class Shared:
class Server(WebSocket, Shared): class Server(WebSocket, Shared):
def setup(self, routes, websockets, debug_suppress_routes=None, debug=False): def setup(self, routes, websockets, debug=False):
routes[PIPE_ROUTE] = ServerPipe() routes[PIPE_ROUTE] = ServerPipe()
super().setup(routes, debug_suppress_routes=debug_suppress_routes, debug=debug) super().setup(routes, debug=debug)
self.websockets = websockets self.websockets = websockets
self._last_websockets = self.websockets.copy() self._last_websockets = self.websockets.copy()
self._peers = {} self._peers = {}
@ -403,9 +399,9 @@ class Server(WebSocket, Shared):
class Client(WebSocketClient, Shared): class Client(WebSocketClient, Shared):
def setup(self, routes, debug_suppress_routes=None, debug=False): def setup(self, routes, debug=False):
routes[PIPE_ROUTE] = DummyPipe() routes[PIPE_ROUTE] = DummyPipe()
super().setup(routes, debug_suppress_routes=debug_suppress_routes, debug=debug) super().setup(routes, debug=debug)
self.override_methods() self.override_methods()