dsmq 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

dsmq/client.py

@@ -1,6 +1,7 @@
 import json
 import time
 from websockets.sync.client import connect as ws_connect
+from websockets.exceptions import ConnectionClosedError
 
 _default_host = "127.0.0.1"
 _default_port = 30008
@@ -9,14 +10,16 @@ _n_retries = 10
 _initial_retry = 0.01  # seconds
 
 
-def connect(host=_default_host, port=_default_port):
-    return DSMQClientSideConnection(host, port)
+def connect(host=_default_host, port=_default_port, verbose=False):
+    return DSMQClientSideConnection(host, port, verbose=verbose)
 
 
 class DSMQClientSideConnection:
-    def __init__(self, host, port):
+    def __init__(self, host, port, verbose=False):
         self.uri = f"ws://{host}:{port}"
-        print(f"Connecting to dsmq server at {self.uri}")
+        self.verbose = verbose
+        if self.verbose:
+            print(f"Connecting to dsmq server at {self.uri}")
         for i_retry in range(_n_retries):
             try:
                 self.websocket = ws_connect(self.uri)
@@ -26,7 +29,8 @@ class DSMQClientSideConnection:
                 # Exponential backoff
                 # Wait twice as long each time before trying again.
                 time.sleep(_initial_retry * 2**i_retry)
-                print("    ...trying again")
+                if self.verbose:
+                    print("    ...trying again")
 
         if self.websocket is None:
             raise ConnectionRefusedError("Could not connect to dsmq server.")
@@ -36,7 +40,11 @@ class DSMQClientSideConnection:
     def get(self, topic):
         msg = {"action": "get", "topic": topic}
         self.websocket.send(json.dumps(msg))
-        msg_text = self.websocket.recv()
+        try:
+            msg_text = self.websocket.recv()
+        except ConnectionClosedError:
+            self.close()
+
         msg = json.loads(msg_text)
         return msg["message"]
 

dsmq/server.py

@@ -5,6 +5,7 @@ import sys
 from threading import Thread
 import time
 from websockets.sync.server import serve as ws_serve
+from websockets.exceptions import ConnectionClosedError
 
 _default_host = "127.0.0.1"
 _default_port = 30008
@@ -138,7 +139,10 @@ AND timestamp = a.min_time
                 # Handle the case where no results are returned
                 message = ""
 
-            websocket.send(json.dumps({"message": message}))
+            try:
+                websocket.send(json.dumps({"message": message}))
+            except ConnectionClosedError:
+                pass
         elif msg["action"] == "shutdown":
             # Run this from a separate thread to prevent deadlock
             global dsmq_server

{dsmq-1.2.1.dist-info → dsmq-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsmq
-Version: 1.2.1
+Version: 1.2.3
 Summary: A dead simple message queue
 License-File: LICENSE
 Requires-Python: >=3.10

{dsmq-1.2.1.dist-info → dsmq-1.2.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
 dsmq/__init__.py,sha256=YCgbnQAk8YbtHRyMcU0v2O7RdRhPhlT-vS_q40a7Q6g,50
-dsmq/client.py,sha256=2i3BhpQM71j-uZlqiJvzQgywi1y07K1VgQe8i2Koi0g,2070
+dsmq/client.py,sha256=p6irQZOE4b2fpTUwSrEUraPmrJzvT8QSU01ak9qpGCQ,2351
 dsmq/demo.py,sha256=K53cC5kN7K4kNJlPq7c5OTIMHRCKTo9hYX2aIos57rU,542
 dsmq/example_get_client.py,sha256=PvAsDGEAH1kVBifLVg2rx8ZxnAZmvzVCvZq13VgpLds,301
 dsmq/example_put_client.py,sha256=QxDc3i7KAjjhpwxRRpI0Ke5KTNSPuBf9kkcGyTvUEaw,353
-dsmq/server.py,sha256=kCqBzgikvJlCgAfLHd18LS7fmkYW6e0RhmdwqdeXJ7Q,6079
+dsmq/server.py,sha256=HkV1yTYe0u_P6TZVAS_wBkT6TDLySfmdZPVvt-VyeF0,6219
 dsmq/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsmq/tests/integration_test.py,sha256=lC97LAzdQixv75OwjqjKTvYnSZpsP0zuzFP8ocUnjl8,6031
-dsmq-1.2.1.dist-info/METADATA,sha256=6DSNtpbtnGbwQ5nGM0_tX1lQaxP7VWFmcBH8mU-RAN0,4730
-dsmq-1.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dsmq-1.2.1.dist-info/licenses/LICENSE,sha256=3Yu1mAp5VsKmnDtzkiOY7BdmrLeNwwZ3t6iWaLnlL0Y,1071
-dsmq-1.2.1.dist-info/RECORD,,
+dsmq-1.2.3.dist-info/METADATA,sha256=H3t1g1Hs68VsheHaCqzrp2bs1ekwzUM5ajC7bzgjH34,4730
+dsmq-1.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dsmq-1.2.3.dist-info/licenses/LICENSE,sha256=3Yu1mAp5VsKmnDtzkiOY7BdmrLeNwwZ3t6iWaLnlL0Y,1071
+dsmq-1.2.3.dist-info/RECORD,,