From 1ea5b139ca63c5f8791bf39e0d75e0e0ae45f3ec Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 8 Aug 2020 14:39:23 +0200 Subject: [PATCH 1/2] print warning when we run out of tunnel IDs --- broker/src/tunneldigger_broker/broker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/broker/src/tunneldigger_broker/broker.py b/broker/src/tunneldigger_broker/broker.py index 74018cab..853637b7 100644 --- a/broker/src/tunneldigger_broker/broker.py +++ b/broker/src/tunneldigger_broker/broker.py @@ -123,6 +123,7 @@ def create_tunnel(self, broker, address, uuid, remote_tunnel_id, client_features try: tunnel_id = self.tunnel_ids.pop() except KeyError: + logger.warning("No more tunnel IDs available -- {} active tunnels".format(len(self.tunnels))) return False logger.info("Creating tunnel %s with id %d." % (tunnel_str, tunnel_id)) From 93a11a8123479fa1ca951fade84c9bac80bcae24 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 9 Aug 2020 12:38:39 +0200 Subject: [PATCH 2/2] use lazy string interpolation --- broker/src/tunneldigger_broker/broker.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/broker/src/tunneldigger_broker/broker.py b/broker/src/tunneldigger_broker/broker.py index 853637b7..88759405 100644 --- a/broker/src/tunneldigger_broker/broker.py +++ b/broker/src/tunneldigger_broker/broker.py @@ -102,11 +102,12 @@ def create_tunnel(self, broker, address, uuid, remote_tunnel_id, client_features # Check if they are all within "time". delta = now - tunnelCollection[0] # Delta of oldest timestamp in collection and now if delta <= self.connection_rate_limit_per_ip_time: - logger.info("Rejecting tunnel {0} due to per-IP rate limiting: {1} attempts in {2} seconds".format( + logger.info( + "Rejecting tunnel %s due to per-IP rate limiting: %d attempts in %d seconds", tunnel_str, len(tunnelCollection), int(delta), - )) + ) broker.hook_manager.run_hook( 'broker.connection-rate-limit', address[0], @@ -123,10 +124,10 @@ def create_tunnel(self, broker, address, uuid, remote_tunnel_id, client_features try: tunnel_id = self.tunnel_ids.pop() except KeyError: - logger.warning("No more tunnel IDs available -- {} active tunnels".format(len(self.tunnels))) + logger.warning("No more tunnel IDs available -- %d active tunnels", self.tunnels) return False - logger.info("Creating tunnel %s with id %d." % (tunnel_str, tunnel_id)) + logger.info("Creating tunnel %s with id %d.", tunnel_str, tunnel_id) try: tunnel = td_tunnel.Tunnel(