split app loggeer, audit logger

nationalarchives · Nov 8, 2024 · f0a1d9d · f0a1d9d
1 parent acc990e
commit f0a1d9d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/app/logger_config.py b/app/logger_config.py
@@ -21,6 +21,26 @@ def setup_logging(app):
         "[%(asctime)s] %(remote_addr)s requested %(url)s\n"
         "%(levelname)s in %(module)s: %(message)s"
     )
-    default_handler.setFormatter(formatter)
 
-    app.logger.setLevel(logging.INFO)
+    # APP LOGGER
+    app_logger = logging.getLogger("app_logger")
+    app_handler = (
+        logging.StreamHandler()
+    )
+    app_handler.setFormatter(formatter)
+    app_logger.setLevel(logging.INFO)
+    app_logger.addHandler(app_handler)
+
+    # AUDIT LOGGER
+    audit_logger = logging.getLogger("audit_logger")
+    audit_handler = (
+        logging.StreamHandler()
+    )
+    audit_handler.setFormatter(formatter)
+    audit_logger.setLevel(logging.INFO)
+    audit_logger.addHandler(audit_handler)
+
+    app.logger.removeHandler(default_handler)
+
+    app.audit_logger = audit_logger
+    app.app_logger = app_logger
diff --git a/app/main/routes.py b/app/main/routes.py
@@ -682,7 +682,7 @@ def record(record_id: uuid.UUID):
     try:
         presigned_url = create_presigned_url(file)
     except Exception as e:
-        current_app.logger.info(
+        current_app.app_logger.info(
             f"Failed to create presigned url for document render non-javascript fallback {e}"
         )
 
@@ -727,7 +727,7 @@ def download_record(record_id: uuid.UUID):
     try:
         s3_file_object = s3.get_object(Bucket=bucket, Key=key)
     except Exception as e:
-        current_app.logger.error(f"Failed to get object from S3: {e}")
+        current_app.app_logger.error(f"Failed to get object from S3: {e}")
         abort(404)
 
     download_filename = file.FileName
@@ -742,7 +742,7 @@ def download_record(record_id: uuid.UUID):
         file_content = s3_file_object["Body"].read()
         file_type = download_filename.split(".")[-1].lower()
     except Exception as e:
-        current_app.logger.error(f"Error reading S3 file content: {e}")
+        current_app.app_logger.error(f"Error reading S3 file content: {e}")
         abort(500)
 
     content_type = s3_file_object.get("ContentType", "application/octet-stream")
@@ -761,7 +761,7 @@ def download_record(record_id: uuid.UUID):
             as_attachment=True,
             download_name=download_filename,
         )
-    current_app.logger.info(
+    current_app.app_logger.info(
         json.dumps({"user_id": session["user_id"], "file": key})
     )
     return response

diff --git a/app/main/util/render_utils.py b/app/main/util/render_utils.py
@@ -57,7 +57,7 @@ def get_download_filename(file):
 def create_presigned_url(file):
     file_extension = file.FileName.split(".")[-1].lower()
     if file_extension not in current_app.config["SUPPORTED_RENDER_EXTENSIONS"]:
-        current_app.logger.warning(
+        current_app.app_logger.warning(
             f"Rendering file format '{file_extension}' is not currently supported by AYR."
         )
         return None
@@ -88,7 +88,7 @@ def generate_pdf_manifest(record_id):
     try:
         presigned_url = create_presigned_url(file)
     except Exception as e:
-        current_app.logger.info(
+        current_app.app_logger.info(
             f"Failed to create presigned url for document render non-javascript fallback {e}"
         )
 
@@ -166,7 +166,7 @@ def generate_image_manifest(s3_file_object, record_id):
     try:
         presigned_url = create_presigned_url(file)
     except Exception as e:
-        current_app.logger.info(
+        current_app.app_logger.info(
             f"Failed to create presigned url for document render non-javascript fallback {e}"
         )