From 38d9e87393283c6340e1856e2e6b11e823875ac5 Mon Sep 17 00:00:00 2001 From: Guy Van Sanden Date: Wed, 12 Feb 2025 11:11:58 +0100 Subject: [PATCH] Test threading lock --- server/src/tellmesrv.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/server/src/tellmesrv.py b/server/src/tellmesrv.py index 25cc03c..433658f 100644 --- a/server/src/tellmesrv.py +++ b/server/src/tellmesrv.py @@ -18,26 +18,25 @@ with open(r'/etc/tellme/hooks.yml') as hooksfile: def sendmessage(target, message): print("Sendmessage %s called to %s" % (message, target)) - with lock: - msg = ("%s %s" % (target, message)) + msg = ("%s %s" % (target, message)) - # Create a unique correlation ID - command = { - "corrId": f"id{random.randint(0, 999999)}", - "cmd": msg, - } - json_command = json.dumps(command) + # Create a unique correlation ID + command = { + "corrId": f"id{random.randint(0, 999999)}", + "cmd": msg, + } + json_command = json.dumps(command) - """ Connects to WebSocket server, sends a message, and returns the response """ - uri = "ws://localhost:5080" - ws = websocket.create_connection(uri) # Blocking WebSocket connection - ws.send(json_command) # Send message to WebSocket - response = ws.recv() # Receive response - print("Message %s sent over websocket to %s" % (message, target)) - # ws.close() # Close WebSocket connection - # print(response) - ws.close() - return response + """ Connects to WebSocket server, sends a message, and returns the response """ + uri = "ws://localhost:5080" + ws = websocket.create_connection(uri) # Blocking WebSocket connection + ws.send(json_command) # Send message to WebSocket + response = ws.recv() # Receive response + print("Message %s sent over websocket to %s" % (message, target)) + # ws.close() # Close WebSocket connection + # print(response) + ws.close() + return response @app.route("/webhook/", methods=['POST']) def webhook_receiver(id): @@ -53,7 +52,8 @@ def webhook_receiver(id): if target is not None: print(target) - sendmessage(target, data.get('message')) + with lock: + sendmessage(target, data.get('message')) else: print("No target found, dropping message")