Slight improvements to logging

app/controller/api/workload_host_routes.py

@@ -24,7 +24,6 @@ def add_workload_host():
     )
     db.session.add(instance)
     db.session.commit()
-    logger.debug("WorkloadHost added to DB")
     return api_response(data=instance.to_json(), status=201)
 
 @api_bp.route('/workload_hosts/<workload_host_id>', methods=['PUT'])
@@ -196,7 +195,7 @@ def enroll_workload_host():
             return api_response(success=False, message='Invalid region ID', status=400)
 
         if not str(region.enrollment_key)==data['region_enrollment_key']:
-            logger.error(f"Supplied enrollment key{data['region_enrollment_key']} vs key in DB {region.enrollment_key}")
+            logger.error(f"Supplied enrollment key {data['region_enrollment_key']} vs key in DB {region.enrollment_key}")
             return api_response(success=False, message='Invalid region enrollment key', status=400)
 
         # Process IP addresses
@@ -364,7 +363,7 @@ def manage_workload_host_labels(host_id):
         except Exception as e:
             db.session.rollback()
             error_message = f"Failed to {'update' if label else 'add'} label"
-            logger.error(f"{error_message}. Error: {str(e)}")
+            logger.error(f"{error_message} Error: {str(e)}")
             return api_response(success=False, message=error_message, status=500)
 
     elif request.method == 'DELETE':
@@ -390,7 +389,7 @@ def manage_workload_host_labels(host_id):
         except Exception as e:
             db.session.rollback()
             error_message = f"Failed to delete label {data['label_key']}"
-            logger.error(f"{error_message}. Error: {str(e)}")
+            logger.error(f"{error_message} Error: {str(e)}")
             return api_response(success=False, message=error_message, status=500)
 
 # @api_bp.route('/workloads_hosts/,workload_host_id>/resource_utilisation', methods=['GET'] )
@@ -488,7 +487,6 @@ def remove_workload_host_available_port(workload_host_id, available_port_id):
 
 @api_bp.route("/workload_hosts/<workload_host_id>/container_workloads", methods=['GET'])
 def get_container_workloads_for_host(workload_host_id):
-    logger.debug("Inside get_container_workloads_for_host")
     """
     Get all container workloads for a specific host in pod-update format.
 

app/tasks/container_lifecycle.py

@@ -189,15 +189,15 @@ def process_container_deletion(self, container_id: str) -> None:
         if should_delete_entire_pod:
             # Delete all containers in the pod
             pod_payload = build_pod_payload(pod, deleted_container_id=None, use_db_state=True)
-            logger.warning(f"Ive been instructed to delete the whole pod, returned {pod_payload}")
+            logger.warning(f"I've been instructed to delete the whole pod, returned {pod_payload}")
             # Override all containers to be deleted
             for container_spec in pod_payload["job_details"]["containers"]:
                 container_spec["desired_state"] = "deleted"
-            logger.warning(f"after changes {pod_payload}")                
+            logger.warning(f"After changes {pod_payload}")
         else:
             # Just delete the specific container
             pod_payload = build_pod_payload(pod, deleted_container_id=container_id, use_db_state=True)
-            logger.warning(f"Ive been instructed to delete single container, returned {pod_payload}")
+            logger.warning(f"I've been instructed to delete single container, returned {pod_payload}")
         # Handle Cloudflare cleanup
         cleanup_cloudflare_resources(container_id)
 

app/utils/container_deleted.py

@@ -48,7 +48,6 @@ def update_pod_status(container: Workload) -> None:
 
 
 def check_deleted_container(container: Workload) -> None:
-    logger.debug("Inside check_deleted_container")
     """
     Handle cleanup when a container is soft-deleted (or moves to
     ``pending-deleted``).

app/utils/create_workload_container.py

@@ -701,7 +701,7 @@ def ensure_tunnel_and_dns(
         except requests.exceptions.HTTPError as e:
 
             if e.response is not None and e.response.status_code == 404:
-                logger.error("fxxxxxxxxxxxxxxx hit a 404")
+                logger.error("Cloudflare request failed with 404")
                 AuditEntry.log_event(
                     object=pod,
                     action="cloudflare_tunnel_fatal_error",
@@ -713,7 +713,7 @@ def ensure_tunnel_and_dns(
                     }
                 )
             else:
-                 logger.error(f"fxxxxxxxxxxxxxxx hit a error thats not 404 response:{e.response} status_code:{type(e.response.status_code)}{e.response.status_code}")
+                 logger.error(f"Cloudflare request failed with error that's not 404 response:{e.response} status_code:{type(e.response.status_code)}{e.response.status_code}")
             raise
         tunnel = CloudflareTunnel(
             token=cf_rsp["token"],

websocket_server/events/docker.py

@@ -95,8 +95,7 @@ def register_socketio_handlers(socketio):
                     data=json.dumps(payload),
                     headers=headers,
                 )
-                logger.debug(websocket_server_response)
-                logger.info("Update complete")
+                logger.info("Status update sent to API server")
 
         except Exception as e:
             logger.error(f"Error processing Docker event: {e}")

websocket_server/events/libvirt.py

@@ -61,8 +61,7 @@ def register_socketio_handlers(socketio):
 
                 headers = {"Content-Type": "application/json"}
                 websocket_server_response = requests.put(f"{api_server_url}/{action_URL}", data=json.dumps(payload), headers=headers)
-                logger.debug( websocket_server_response)
-                logger.info("Update complete")
+                logger.info("Status update sent to API server")
 
             if event_type=="libvirt_stopped":
                 #Send the update to the API Server
@@ -82,10 +81,9 @@ def register_socketio_handlers(socketio):
 
                 headers = {"Content-Type": "application/json"}
                 websocket_server_response = requests.put(f"{api_server_url}/{action_URL}", data=json.dumps(payload), headers=headers)
-                logger.debug( websocket_server_response)
-                logger.info("Update complete")
-            
-            
+                logger.info("Status update sent to API server")
+
+
             if event_type=="libvirt_undefined":
                 #Send the update to the API Server
                 # system_vm_id
@@ -104,8 +102,7 @@ def register_socketio_handlers(socketio):
 
                 headers = {"Content-Type": "application/json"}
                 websocket_server_response = requests.put(f"{api_server_url}/{action_URL}", data=json.dumps(payload), headers=headers)
-                logger.debug( websocket_server_response)
-                logger.info("Update complete")
+                logger.info("Status update sent to API server")
 
         except Exception as e:
             logger.error(f"Error processing libvirt event: {e}")