Roll back / update logging

Author: skadefro

.vscode/launch.json

@@ -58,11 +58,11 @@
             "preLaunchTask": "openflownodered-tsc-watch",
             "program": "${workspaceRoot}/OpenFlowNodeRED/src/index.ts",
             "request": "launch",
-            "runtimeArgs": [
-                "--nolazy",
-                "--trace-warnings"
-            ],
             "showAsyncStacks": true,
+            // "runtimeArgs": [
+            //     "--nolazy",
+            //     "--trace-warnings"
+            // ],
             "trace": true,
             "runtimeExecutable": null,
             "sourceMaps": true,

OpenFlow/src/DatabaseConnection.ts

@@ -1247,8 +1247,8 @@ export class DatabaseConnection {
                 } else {
                     newObj[key] = value;
                 }
-            } catch (err) {
-                me._logger.error("encryptentity " + err.message);
+            } catch (error) {
+                me._logger.error(error);
                 newObj[key] = value;
             }
             return newObj;
@@ -1277,8 +1277,8 @@ export class DatabaseConnection {
                 } else {
                     newObj[key] = value;
                 }
-            } catch (err) {
-                me._logger.error("decryptentity " + err.message);
+            } catch (error) {
+                me._logger.error(error);
                 newObj[key] = value;
             }
             return newObj;

OpenFlow/src/Logger.ts

@@ -22,32 +22,27 @@ export class Logger {
                 colorize: true
             },
         };
-        const enumerateErrorFormat = winston.format(info => {
-            if ((info.message as any) instanceof Error) {
-                const e = (info.message as any) as Error;
-                info.message = Object.assign({
-                    message: e.message,
-                    stack: e.stack
-                }, info.message);
+        const myFormat = winston.format.printf(info => {
+            if (info instanceof Error || info.stack) {
+                return `${info.timestamp} [${info.level}] ${info.message} \n ${info.stack}`;
             }
-
-            if (info instanceof Error) {
-                return Object.assign({
-                    message: info.message,
-                    stack: info.stack
-                }, info);
-            }
-
-            return info;
+            return `${info.timestamp} [${info.level}] ${info.message}`;
         });
+        options.console.format = winston.format.combine(
+            winston.format.errors({ stack: true }),
+            winston.format.timestamp({ format: 'HH:mm:ss' }),
+            winston.format.colorize(),
+            winston.format.json(),
+            myFormat
+        );
         const logger: winston.Logger = winston.createLogger({
             level: "debug",
             //format: winston.format.json(),
             format: winston.format.combine(
-                enumerateErrorFormat(),
+                winston.format.errors({ stack: true }),
                 winston.format.timestamp({ format: 'HH:mm:ss' }),
-                // winston.format.json()
-                winston.format.printf(info => `${info.timestamp} ${info.level}: ${info.message}` + (info.splat !== undefined ? `${info.splat}` : " "))
+                winston.format.json(),
+                myFormat
             ),
             transports: [
                 new winston.transports.File(options.file),