webserver.py:HEADmaster

    - fix parameter extraction in validate_ functions
    - fix logging statement missing a parameter.
client.py:
    - cosmetic changes: change multiple returns to building retval
    - logging fixes.

1 files changed, 5 insertions, 5 deletions

diff --git a/webserver.py b/webserver.py
index 1e1a068..4314b5e 100644
--- a/webserver.py
+++ b/webserver.py
@@ -412,13 +412,13 @@ def validate_directive(command: str, args: list, client_id: str, camera_id: str)
     # Validate arguments passed from the frontend:
     match command:
         case 'modify_camera_name':
-            retval = validate_camera_name(args, client_id, camera_id)
+            retval = validate_camera_name(args[0], client_id, camera_id)
         case 'modify_camera_threshold':
-            retval = validate_camera_threshold(args)
+            retval = validate_camera_threshold(args[0])
         case 'modify_camera_grace_pd':
-            retval = validate_camera_grace_period(args)
+            retval = validate_camera_grace_period(args[0])
         case 'modify_camera_address':
-            retval = validate_camera_address(args)
+            retval = validate_camera_address(args[0])
         # case 'add_camera':
         #     retval = validate_add_camera(args, client_id)
         case 'remove_camera':
@@ -509,7 +509,7 @@ def validate_camera_grace_period(grace_period) -> bool:
             logger.error("Movement grace period cannot be negative: %r.", grace_period)
             retval = False
     except ValueError as exc:
-        logger.error("Invalid movement grace period: %r, exception: ", grace_period, exc)
+        logger.error("Invalid movement grace period: %r, exception: %r", grace_period, exc)
         retval = False
     return retval