Increase timeout and disable Postgres notify on send

src/smpp_gateway/client.py

@@ -71,6 +71,7 @@ def __init__(
         submit_sm_params: dict,
         set_priority_flag: bool,
         mt_messages_per_second: int,
+        event_loop_timeout: int,
         *args,
         **kwargs,
     ):
@@ -81,6 +82,7 @@ def __init__(
         self.submit_sm_params = submit_sm_params
         self.set_priority_flag = set_priority_flag
         self.mt_messages_per_second = mt_messages_per_second
+        self.event_loop_timeout = event_loop_timeout
         super().__init__(*args, **kwargs)
         self._pg_conn = pg_listen(self.backend.name)
 
@@ -176,11 +178,13 @@ def receive_pg_notify(self):
             self.send_mt_messages()
 
     def send_mt_messages(self):
-        limit = self.mt_messages_per_second * self.timeout
+        limit = self.mt_messages_per_second * self.event_loop_timeout
         smses = get_mt_messages_to_send(limit=limit, backend=self.backend)
         if len(smses) == 0:
             return
-        logger.info(f"Found {len(smses)} messages to send in {self.timeout} seconds")
+        logger.info(
+            f"Found {len(smses)} messages to send in {self.event_loop_timeout} seconds"
+        )
         submit_sm_resps = []
         for sms in smses:
             params = {**self.submit_sm_params, **sms["params"]}
@@ -237,7 +241,7 @@ def listen(self, ignore_error_codes=None, auto_send_enquire_link=True):
         while True:
             # When either main socket has data or _pg_conn has data, select.select will return
             rlist, _, _ = select.select(
-                [self._socket, self._pg_conn], [], [], self.timeout
+                [self._socket, self._pg_conn], [], [], self.event_loop_timeout
             )
             if not rlist and auto_send_enquire_link:
                 self.logger.debug("Socket timeout, listening again")

src/smpp_gateway/management/commands/smpp_client.py

@@ -60,7 +60,14 @@ def add_arguments(self, parser):
         parser.add_argument(
             "--socket-timeout",
             type=int,
-            default=os.environ.get("SMPPLIB_SOCKET_TIMEOUT", 5),
+            default=os.environ.get("SMPPLIB_SOCKET_TIMEOUT", 30),
+        )
+        parser.add_argument(
+            "--event-loop-timeout",
+            type=int,
+            default=os.environ.get("SMPPLIB_EVENT_LOOP_TIMEOUT", 5),
+            help="Timeout for listening for Postgres notifications and new "
+            "incoming messages.",
         )
         parser.add_argument(
             "--database-url",

src/smpp_gateway/smpp.py

@@ -21,6 +21,7 @@ def get_smpplib_client(
     set_priority_flag: bool,
     mt_messages_per_second: int,
     socket_timeout: int,
+    event_loop_timeout: int,
     hc_check_uuid: str,
     hc_ping_key: str,
     hc_check_slug: str,
@@ -39,6 +40,7 @@ def get_smpplib_client(
         submit_sm_params,
         set_priority_flag,
         mt_messages_per_second,
+        event_loop_timeout,
         # Pass-through arguments to smpplib.client.Client:
         host,
         port,
@@ -77,6 +79,7 @@ def start_smpp_client(options):
         options["set_priority_flag"],
         options["mt_messages_per_second"],
         options["socket_timeout"],
+        options["event_loop_timeout"],
         options["hc_check_uuid"],
         options["hc_ping_key"],
         options["hc_check_slug"],

tests/test_client.py

@@ -27,6 +27,7 @@ def test_received_mo_message(self):
             False,  # set_priority_flag
             20,  # mt_messages_per_second
             30,  # socket_timeout
+            5,  # event_loop_timeout
             "",  # hc_check_uuid
             "",  # hc_ping_key
             "",  # hc_check_slug
@@ -65,6 +66,7 @@ def test_received_message_receipt(self):
             False,  # set_priority_flag
             20,  # mt_messages_per_second
             30,  # socket_timeout
+            5,  # event_loop_timeout
             "",  # hc_check_uuid
             "",  # hc_ping_key
             "",  # hc_check_slug
@@ -109,6 +111,7 @@ def test_received_null_short_message(self):
             False,  # set_priority_flag
             20,  # mt_messages_per_second
             30,  # socket_timeout
+            5,  # event_loop_timeout
             "",  # hc_check_uuid
             "",  # hc_ping_key
             "",  # hc_check_slug
@@ -149,6 +152,7 @@ def test_message_sent_handler():
         False,  # set_priority_flag
         20,  # mt_messages_per_second
         30,  # socket_timeout
+        5,  # event_loop_timeout
         "",  # hc_check_uuid
         "",  # hc_ping_key
         "",  # hc_check_slug
@@ -188,6 +192,7 @@ def get_client_and_message(
             set_priority_flag,
             20,  # mt_messages_per_second
             30,  # socket_timeout
+            5,  # event_loop_timeout
             "",  # hc_check_uuid
             "",  # hc_ping_key
             "",  # hc_check_slug