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

dsmq/server.py

@@ -19,7 +19,7 @@ _db_name = "file::memory:?cache=shared"
 dsmq_server = None
 
 
-def serve(host=_default_host, port=_default_port):
+def serve(host=_default_host, port=_default_port, verbose=False):
     """
     For best results, start this running in its own process and walk away.
     """
@@ -50,11 +50,13 @@ CREATE TABLE IF NOT EXISTS messages (timestamp DOUBLE, topic TEXT, message TEXT)
     # or send it to me at brohrer@gmail.com,
     global dsmq_server
 
-    dsmq_server = ws_serve(request_handler, host, port)
-    dsmq_server.serve_forever()
-    print()
-    print(f"Server started at {host} on port {port}.")
-    print("Waiting for clients...")
+    # dsmq_server = ws_serve(request_handler, host, port)
+    with ws_serve(request_handler, host, port) as dsmq_server:
+        dsmq_server.serve_forever()
+    if verbose:
+        print()
+        print(f"Server started at {host} on port {port}.")
+        print("Waiting for clients...")
 
     sqlite_conn.close()
 
@@ -140,11 +142,9 @@ AND timestamp = a.min_time
         elif msg["action"] == "shutdown":
             # Run this from a separate thread to prevent deadlock
             global dsmq_server
-            print("Shutting down the dsmq server.")
 
             def shutdown_gracefully(server_to_shutdown):
                 server_to_shutdown.shutdown()
-                time.sleep(_pause)
 
                 filenames = os.listdir()
                 for filename in filenames:
@@ -155,9 +155,11 @@ AND timestamp = a.min_time
                             pass
 
             Thread(target=shutdown_gracefully, args=(dsmq_server,)).start()
-            sqlite_conn.close()
+            break
         else:
-            print("Action must either be 'put', 'get', or 'shudown'")
+            raise RuntimeWarning(
+                "dsmq client action must either be 'put', 'get', or 'shutdown'"
+            )
 
         # Periodically clean out messages from the queue that are
         # past their sell buy date.

dsmq/tests/integration_test.py

@@ -1,5 +1,6 @@
 import multiprocessing as mp
 import time
+from websockets.exceptions import ConnectionClosed
 from dsmq.server import serve
 from dsmq.client import connect
 
@@ -12,7 +13,7 @@ port = 30303
 _short_pause = 0.001
 _pause = 0.01
 _long_pause = 0.1
-_very_long_pause = 0.1
+_very_long_pause = 2.0
 
 
 def test_client_server():
@@ -38,9 +39,13 @@ def test_client_server():
     mq.shutdown_server()
     mq.close()
 
-    # It takes a sec to shut down the server
-    time.sleep(_long_pause)
-    assert not p_server.is_alive()
+    closed = False
+    try:
+        mq = connect(host, port)
+    except ConnectionRefusedError as e:
+        print(e)
+        closed = True
+    assert closed
 
 
 def test_write_one_read_one():

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

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

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

@@ -3,10 +3,10 @@ dsmq/client.py,sha256=2i3BhpQM71j-uZlqiJvzQgywi1y07K1VgQe8i2Koi0g,2070
 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=iiaa7IoxZy1143vwTO7eMD-kzUKTTVff37E3KPpJ4cU,6010
+dsmq/server.py,sha256=kCqBzgikvJlCgAfLHd18LS7fmkYW6e0RhmdwqdeXJ7Q,6079
 dsmq/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsmq/tests/integration_test.py,sha256=TJyx_wsFWeSvYuMF7vCNSGcWstTSLZbuAeKrxrQcj98,5930
-dsmq-1.1.0.dist-info/METADATA,sha256=S72f4YPsNO07F8W4cnrhGGEW-4Eoao9BBh2VP28uziM,4730
-dsmq-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dsmq-1.1.0.dist-info/licenses/LICENSE,sha256=3Yu1mAp5VsKmnDtzkiOY7BdmrLeNwwZ3t6iWaLnlL0Y,1071
-dsmq-1.1.0.dist-info/RECORD,,
+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,,