Skip to content

Commit

Permalink
honour log_requests as original code did
Browse files Browse the repository at this point in the history
  • Loading branch information
meejah committed Apr 15, 2021
1 parent 1a1947d commit aa58b85
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
5 changes: 5 additions & 0 deletions src/wormhole_transit_relay/server_state.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from collections import defaultdict

import automat
from twisted.python import log
from zope.interface import (
Interface,
Attribute,
Expand Down Expand Up @@ -265,6 +266,8 @@ def _unregister(self):
def _send_bad(self):
self._mood = "errory"
self._client.send(b"bad handshake\n")
if self._client.factory.log_requests:
log.msg("transit handshake failure")

@_machine.output()
def _send_ok(self):
Expand All @@ -273,6 +276,8 @@ def _send_ok(self):
@_machine.output()
def _send_impatient(self):
self._client.send(b"impatient\n")
if self._client.factory.log_requests:
log.msg("transit impatience failure")

@_machine.output()
def _count_bytes(self, data):
Expand Down
2 changes: 2 additions & 0 deletions src/wormhole_transit_relay/server_tap.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def makeService(config, reactor=reactor):
transit = transit_server.Transit(usage, reactor.seconds)
tcp_factory = protocol.ServerFactory()
tcp_factory.protocol = transit_server.TransitConnection
tcp_factory.log_requests = False

if ws_ep is not None:
ws_url = config["websocket-url"]
Expand All @@ -71,6 +72,7 @@ def makeService(config, reactor=reactor):
ws_factory = WebSocketServerFactory(ws_url)
ws_factory.protocol = transit_server.WebSocketTransitConnection
ws_factory.transit = transit
ws_factory.log_requests = False

tcp_factory.transit = transit
parent = MultiService()
Expand Down
1 change: 1 addition & 0 deletions src/wormhole_transit_relay/test/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def new_protocol_tcp(self):
server_factory = ServerFactory()
server_factory.protocol = TransitConnection
server_factory.transit = self._transit_server
server_factory.log_requests = self.log_requests
server_protocol = server_factory.buildProtocol(('127.0.0.1', 0))

@implementer(IRelayTestClient)
Expand Down
2 changes: 2 additions & 0 deletions src/wormhole_transit_relay/test/test_transit_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ def new_protocol_ws(self):
ws_factory = WebSocketServerFactory("ws://localhost:4002")
ws_factory.protocol = WebSocketTransitConnection
ws_factory.transit = self._transit_server
ws_factory.log_requests = self.log_requests
ws_protocol = ws_factory.buildProtocol(('127.0.0.1', 0))

@implementer(IRelayTestClient)
Expand Down Expand Up @@ -656,6 +657,7 @@ def new_protocol_ws(self):
ws_factory = WebSocketServerFactory("ws://localhost:4002")
ws_factory.protocol = WebSocketTransitConnection
ws_factory.transit = self._transit_server
ws_factory.log_requests = self.log_requests
ws_protocol = ws_factory.buildProtocol(('127.0.0.1', 0))

class TransitWebSocketClientProtocol(WebSocketClientProtocol):
Expand Down
6 changes: 4 additions & 2 deletions src/wormhole_transit_relay/transit_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ def disconnect_partner(self):
ITransitClient API
"""
if self._buddy is not None:
log.msg("buddy_disconnected {}".format(self._buddy.get_token()))
if self.factory.log_requests:
log.msg("buddy_disconnected {}".format(self._buddy.get_token()))
self._buddy._client.disconnect()
self._buddy = None

Expand Down Expand Up @@ -203,7 +204,8 @@ def disconnect_partner(self):
ITransitClient API
"""
if self._buddy is not None:
log.msg("buddy_disconnected {}".format(self._buddy.get_token()))
if self.factory.log_requests:
log.msg("buddy_disconnected {}".format(self._buddy.get_token()))
self._buddy._client.disconnect()
self._buddy = None

Expand Down

0 comments on commit aa58b85

Please sign in to comment.