Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib.network: introduce connect ratelimit #609

Merged
merged 3 commits into from
Dec 14, 2023
Merged

lib.network: introduce connect ratelimit #609

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c71e1f
lib.network: add connect rate limit
Morg42 Dec 7, 2023
f7298d1
lib.network: add parameter for rate limit
Morg42 Dec 7, 2023
471d88c
lib.network: introduce connect ratelimit
Morg42 Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions lib/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,11 @@ def data_received_callback(Tcp_client_instance, message)
:type timeout: int
"""

def __init__(self, host, port, name=None, autoreconnect=True, autoconnect=None, connect_retries=5, connect_cycle=5, retry_cycle=30, retry_abort=0, abort_callback=None, binary=False, terminator=False, timeout=1):
def __init__(self, host, port, name=None,
autoreconnect=True, autoconnect=None, connect_retries=5,
connect_cycle=5, retry_cycle=30, retry_abort=0,
abort_callback=None, binary=False, terminator=False, timeout=1,
rate_limit=1, max_rate_connects=10):
self.logger = logging.getLogger(__name__)

# public properties
Expand All @@ -588,6 +592,11 @@ def __init__(self, host, port, name=None, autoreconnect=True, autoconnect=None,
self._abort_callback = abort_callback
self._timeout = timeout

self._ratelimit = rate_limit
self._max_rate_connects = max_rate_connects
self._last_connect = 0
self._num_connects = 0

self._hostip = None
self._family = socket.AF_INET
self._socket = None
Expand All @@ -604,7 +613,6 @@ def __init__(self, host, port, name=None, autoreconnect=True, autoconnect=None,
self.__connect_thread = None
self.__connect_threadlock = threading.Lock()
self.__receive_thread = None
self.__receive_threadlock = threading.Lock()
self.__running = False

# self.logger.setLevel(logging.DEBUG) # Das sollte hier NICHT gesetzt werden, sondern in etc/logging.yaml im Logger lib.network konfiguriert werden!
Expand Down Expand Up @@ -671,6 +679,24 @@ def connect(self):
with self.__connect_threadlock:
self.logger.debug(f'Starting connect to {self._host}:{self._port}')
if not self.__connect_thread or not self.__connect_thread.is_alive():

# limit connection rates
if time.time() < self._last_connect + (1.0 / self._ratelimit):
self.logger.debug(f'connect: rate limit active, minimum delay is {1.0 / self._ratelimit}, current delay is {time.time() - self._last_connect}')
self._num_connects += 1
if self._num_connects >= self._max_rate_connects:

# too many rate limits reached
self.logger.debug(f'connect: max number of rate limits hit {self._max_rate_connects}, aborting connect')
if self._abort_callback:
self._abort_callback()
self._num_connects = 0
return False

# wait till we may connect again
while time.time() < self._last_connect + (1.0 / self._ratelimit):
time.sleep(.1)

self.logger.dbglow(f'connect() creating connect thread "TCP_Connect {self._id}')
self.__connect_thread = threading.Thread(target=self._connect_thread_worker, name=f'TCP_Connect {self._id}')
self.__connect_thread.daemon = True
Expand Down Expand Up @@ -767,6 +793,7 @@ def _connect_thread_worker(self):
self._connect()
if self._is_connected:
try:
self._last_connect = time.time()
if self._connected_callback:
self._connected_callback(self)
name = f'TCP_Client {self._id}'
Expand Down