From cba2da8da73ee22c53f67bb617540ed0bb031e3d Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 13 Nov 2024 13:09:37 -0800 Subject: [PATCH] feature/IO-3029-Enhanced-Logging-File-Based: Add fix bugs Signed-off-by: Dave Richer --- server/routes/miscellaneousRoutes.js | 2 ++ server/utils/logger.js | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/routes/miscellaneousRoutes.js b/server/routes/miscellaneousRoutes.js index 27ef15f15..ff643a4b0 100644 --- a/server/routes/miscellaneousRoutes.js +++ b/server/routes/miscellaneousRoutes.js @@ -54,6 +54,8 @@ router.get("/test-logs", eventAuthorizationMiddleware, (req, res) => { // Test 4: Log with a message that doesn't exceed the size limit and doesn't require an upload. logger.log("Normal log entry", "debug", "user123", { id: 4 }, { detail: "normal log entry" }); + + return res.status(500).send("Logs tested."); }); // Search diff --git a/server/utils/logger.js b/server/utils/logger.js index 620ea98a8..d9e2da253 100644 --- a/server/utils/logger.js +++ b/server/utils/logger.js @@ -191,7 +191,13 @@ const createLogger = () => { return false; }; - if (upload || checkAndUploadLog()) return; + // Upload log immediately if upload is true, otherwise check the log size. + if (upload) { + uploadLogToS3(logEntry, message, type, user); + return; + } + + if (checkAndUploadLog()) return; winstonLogger.log(logEntry); };