From 28150dd2c4d03ed844e8d1a5cfc463f5d1f9b45f Mon Sep 17 00:00:00 2001 From: Franoosh Date: Tue, 26 May 2026 16:32:13 +0200 Subject: client.cfg : move log dir to /var/log client.py : use ComputingContoursException and DetectMovementException helpers.py : define ComputingContoursException and DetectMovementException clients.html : small changes webserver.py : minor changes worker.py : log disconnectd from web client on debug, not info --- webserver.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'webserver.py') diff --git a/webserver.py b/webserver.py index 3a95dca..1e1a068 100644 --- a/webserver.py +++ b/webserver.py @@ -76,7 +76,10 @@ auth_service(zmq_context, CERTIFICATE_DIR) zmq_socket = zmq_context.socket(zmq.DEALER) # Connect to ZMQ backend: -zmq_socket.connect(WEB_BACKEND_ADDR) +try: + zmq_socket.connect(WEB_BACKEND_ADDR) +except Exception as exc: + logger.error("Could not connect to backend address: %r" % exc) async def zmq_bridge(): @@ -125,7 +128,8 @@ async def zmq_bridge(): logger.error("Invalid control message on queue: %r", ve) if client_id and camera_id and command and args_list is not None: try: - zmq_socket.send_multipart([ + # TODO: check if this below is correct + await zmq_socket.send_multipart([ client_id, camera_id, command, @@ -190,7 +194,7 @@ async def main_route(request: Request) -> HTMLResponse: request : Request The incoming HTTP request. """ - logger.debug("Main route visited") + logger.debug("Main route visited. CLIENTS_DICT: %s" % CLIENTS_DICT) return templates.TemplateResponse( "main.html", { @@ -454,6 +458,9 @@ def validate_camera_name(name, client_id, camera_id) -> bool: if len(new_name) > MAX_CAMERA_NAME_LENGTH: logger.error("Camera name is too long (max %s characters).", MAX_CAMERA_NAME_LENGTH) retval = False + if ' ' in name: + logger.error("Camera name cannot contain spaces.") + retval = False return retval def validate_camera_threshold(threshold) -> bool: -- cgit v1.3