release/2024-11-01 - Misc fixes

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server/cdk/cdk-wsdl.js

@@ -20,7 +20,7 @@ function CheckCdkResponseForError(socket, soapResponse) {
     //The response was null, this might be ok, it might not.
     CdkBase.createLogEvent(
       socket,
-      "WARNING",
+      "warn",
       `Warning detected in CDK Response - it appears to be null. Stack: ${new Error().stack}`
     );
     return;

server/utils/logger.js

@@ -10,6 +10,18 @@ const WinstonCloudWatch = require("winston-cloudwatch");
 const { isString, isEmpty } = require("lodash");
 const { networkInterfaces, hostname } = require("node:os");
 
+const LOG_LEVELS = {
+  error: { level: 0, name: "error" },
+  warn: { level: 1, name: "warn" },
+  info: { level: 2, name: "info" },
+  http: { level: 3, name: "http" },
+  verbose: { level: 4, name: "verbose" },
+  debug: { level: 5, name: "debug" },
+  silly: { level: 6, name: "silly" }
+};
+
+const normalizeLevel = (level) => (level ? level.toLowerCase() : LOG_LEVELS.debug.name);
+
 const createLogger = () => {
   try {
     const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
@@ -114,7 +126,7 @@ const createLogger = () => {
 
     const log = (message, type, user, record, meta) => {
       winstonLogger.log({
-        level: type.toLowerCase(),
+        level: normalizeLevel(type),
         message,
         user,
         record,
@@ -131,7 +143,8 @@ const createLogger = () => {
     console.error("Error setting up enhanced Logger, defaulting to console.: " + e?.message || "");
     return {
       log: console.log,
-      logger: console.log
+      logger: console.log,
+      LOG_LEVELS
     };
   }
 };

server/web-sockets/web-socket.js

@@ -212,7 +212,7 @@ function LogLevelHierarchy(level) {
       return 4;
     case "INFO":
       return 3;
-    case "WARNING":
+    case "WARN":
       return 2;
     case "ERROR":
       return 1;