Make debug messages conditional on --debug flag to reduce noise

parent b6a0a398
...@@ -56,15 +56,20 @@ def handle_web_message(message: Message, client_sock=None) -> Message: ...@@ -56,15 +56,20 @@ def handle_web_message(message: Message, client_sock=None) -> Message:
from .config import get_analysis_backend from .config import get_analysis_backend
backend = get_analysis_backend() backend = get_analysis_backend()
worker_key = f'analysis_{backend}' worker_key = f'analysis_{backend}'
from .config import get_debug
if get_debug():
print(f"DEBUG: Backend forwarding analyze_request {message.msg_id} to worker {worker_key}") print(f"DEBUG: Backend forwarding analyze_request {message.msg_id} to worker {worker_key}")
if worker_key in worker_sockets: if worker_key in worker_sockets:
# Forward to local worker # Forward to local worker
msg_json = f'{{"msg_type": "{message.msg_type}", "msg_id": "{message.msg_id}", "data": {message.data}}}\n' msg_json = f'{{"msg_type": "{message.msg_type}", "msg_id": "{message.msg_id}", "data": {message.data}}}\n'
if get_debug():
print(f"DEBUG: Sending to worker: {msg_json.strip()}") print(f"DEBUG: Sending to worker: {msg_json.strip()}")
worker_sockets[worker_key].sendall(msg_json.encode('utf-8')) worker_sockets[worker_key].sendall(msg_json.encode('utf-8'))
if get_debug():
print(f"DEBUG: Sent to worker {worker_key}") print(f"DEBUG: Sent to worker {worker_key}")
return None # No immediate response return None # No immediate response
else: else:
if get_debug():
print(f"DEBUG: Worker {worker_key} not found in worker_sockets") print(f"DEBUG: Worker {worker_key} not found in worker_sockets")
return Message('error', message.msg_id, {'error': f'Worker {worker_key} not available'}) return Message('error', message.msg_id, {'error': f'Worker {worker_key} not available'})
elif message.msg_type == 'train_request': elif message.msg_type == 'train_request':
......
...@@ -27,6 +27,7 @@ import os ...@@ -27,6 +27,7 @@ import os
from typing import Dict, Any, Optional from typing import Dict, Any, Optional
from dataclasses import dataclass from dataclasses import dataclass
from .compat import get_socket_path, is_unix_sockets_supported from .compat import get_socket_path, is_unix_sockets_supported
from .config import get_debug
@dataclass @dataclass
...@@ -70,6 +71,7 @@ class SocketCommunicator: ...@@ -70,6 +71,7 @@ class SocketCommunicator:
'data': message.data 'data': message.data
}).encode('utf-8') }).encode('utf-8')
full_data = data + b'\n' full_data = data + b'\n'
if get_debug():
print(f"DEBUG: SocketCommunicator sending: {full_data}") print(f"DEBUG: SocketCommunicator sending: {full_data}")
self.sock.sendall(full_data) self.sock.sendall(full_data)
...@@ -153,6 +155,7 @@ class SocketServer: ...@@ -153,6 +155,7 @@ class SocketServer:
messages = decoded.split('\n') messages = decoded.split('\n')
for msg_str in messages: for msg_str in messages:
if msg_str.strip(): if msg_str.strip():
if get_debug():
print(f"DEBUG: SocketServer processing message: {repr(msg_str)}") print(f"DEBUG: SocketServer processing message: {repr(msg_str)}")
try: try:
msg_data = json.loads(msg_str) msg_data = json.loads(msg_str)
...@@ -161,6 +164,7 @@ class SocketServer: ...@@ -161,6 +164,7 @@ class SocketServer:
msg_id=msg_data['msg_id'], msg_id=msg_data['msg_id'],
data=msg_data['data'] data=msg_data['data']
) )
if get_debug():
print(f"DEBUG: SocketServer parsed message: {message}") print(f"DEBUG: SocketServer parsed message: {message}")
response = self.message_handler(message, client_sock) response = self.message_handler(message, client_sock)
if response: if response:
...@@ -171,6 +175,7 @@ class SocketServer: ...@@ -171,6 +175,7 @@ class SocketServer:
}).encode('utf-8') }).encode('utf-8')
client_sock.sendall(resp_data + b'\n') client_sock.sendall(resp_data + b'\n')
except json.JSONDecodeError as e: except json.JSONDecodeError as e:
if get_debug():
print(f"DEBUG: SocketServer JSON decode error: {e}") print(f"DEBUG: SocketServer JSON decode error: {e}")
pass pass
except: except:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment