Merge pull request #24 from SoftwareAG/log4js

sagpembo · web-flow · commit 8aa0743048c0 · 2024-06-11T08:26:13.000+01:00
Logging switch to log4js
diff --git a/accounts.js b/accounts.js
@@ -12,7 +12,7 @@ var prettyprint = false;
 var url;
 
 function debug(message) {
-    dbg.message("<ACCOUNTS> " + message,4);
+    logger.debug("<ACCOUNTS> " + message);
 }
 
 function help() {
diff --git a/experimental.js b/experimental.js
diff --git a/flowservice.js b/flowservice.js
@@ -5,14 +5,12 @@
  */
 
 const rest = require('./rest-fetch.js');
-const dbg = require('./debug.js');
-
 
 var domainName, username,password,timeout,prettyprint;
 var url;
 
 function debug(message){
-    dbg.message("<FLOWSERVICE> " + message,4);
+    logger.debug("<FLOWSERVICE> " + message);
 }
 
 function help(){
diff --git a/idm.js b/idm.js
@@ -13,7 +13,7 @@ var url;
 var bearerToken;
 
 function debug(message) {
-    dbg.message("<IDM> " + message,4);
+    logger.debug("<IDM> " + message);
 }
 function help() {
     return `
diff --git a/monitor.js b/monitor.js
@@ -12,7 +12,7 @@ var prettyprint = false;
 var url;
 
 function debug(message) {
-    dbg.message("<MONITOR> " + message,4);
+    logger.debug("<MONITOR> " + message);
 }
 
 function help() {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
   "dependencies": {
     "formdata-node": "^6.0.3",
     "https-proxy-agent": "^7.0.4",
+    "log4js": "^6.9.1",
     "node-fetch": "^3.3.2",
     "readline-sync": "^1.4.10",
     "tough-cookie": "^4.1.4"
diff --git a/projects.js b/projects.js
@@ -12,7 +12,7 @@ var prettyprint = false;
 var url;
 
 function debug(message) {
-    dbg.message("<PROJECTS> " + message,4);
+    logger.debug("<PROJECTS> " + message,4);
 }
 
 function help() {
diff --git a/recipe.js b/recipe.js
@@ -10,7 +10,7 @@ var domainName, username, password, timeout, prettyprint;
 var url;
 
 function debug(message) {
-    dbg.message("<RECIPE> " + message,4);
+    logger.debug("<RECIPE> " + message);
 }
 function help() {
     return `
diff --git a/rest-fetch.js b/rest-fetch.js
@@ -8,36 +8,30 @@
 
 const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
 const { CookieJar } = require('tough-cookie');
-const zlib = require('zlib');
+//const zlib = require('zlib');
 const fs = require ('fs')
 const { FormData } = require('formdata-node');
 const { fileFromPathSync } = require('formdata-node/file-from-path');
 const { HttpsProxyAgent }= require('https-proxy-agent');
 var proxyAgent = undefined;
-const { message } = require('./debug');
-const { warn } = require('console');
 const cj = new CookieJar();
 var cookieJar = [];
 var domain
 
-function consolelog(message,level)
-{
-    dbg.message("<REST-FETCH>:" + message,level);
-}
 function debug(message){
-    consolelog(message,4);
+    logger.debug(message);
 }
 
 function info(message){
-    consolelog(message,3);
+    logger.info(message);
 }
 
 function warning(message){
-    consolelog(message,2);
+    logger.warn(message);
 }
 
 function error(message){
-    consolelog(message,1);
+    logger.error(message);
 }
 
 
@@ -67,17 +61,18 @@ function addCookieToJar(cookie,domainName)
 function displayCookies()
 {
     warning("------------------------- COOKIES -------------------------");
-    warning(`⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⠴⠶⠦⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣀⣴⡯⠤⠴⠶⠶⠶⠿⠷⠶⠶⠦⠤⣴⠚⠛⠒⠶⣤⡀⠀⠀⠀⠀⠀⠀⠀
-    ⠀⠀⠀⠀⢀⣀⣠⣄⣤⠶⢚⣯⠭⠤⠶⠤⢤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⢦⣀⡀⠀⠈⢹⣆⠀⠀⠀⠀⠀⠀
-    ⠀⢀⡴⠞⠉⠀⠀⢀⡟⠀⢯⣄⣀⣀⣀⣀⣠⠿⠀⠀⢀⡤⠤⠒⠒⠒⠶⢤⡀⠈⠉⠉⣉⣭⣭⣗⣦⣄⡀⠀⠀
-    ⠀⣟⣀⣀⣠⠴⠞⠉⠀⡠⠤⠶⠾⣍⡭⠥⠤⠤⣀⠀⠘⢧⣀⠀⠀⠀⠀⣀⣽⣀⣀⣈⣧⡀⠀⠀⠈⠙⢿⣦⡀
-    ⣰⠋⠁⠀⠀⣀⣀⡀⠀⠀⠀⠀⠈⠁⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠉⡹⠛⠉⠀⠀⠈⠉⠻⣗⠲⠦⠤⠾⠋⢷
-    ⡏⠀⣴⠋⠉⠁⠈⠉⣳⠀⠀⠀⢀⣠⠤⠶⠦⠤⣄⡀⠀⠀⠀⠀⠀⣀⠤⠴⠶⠦⣤⡀⠀⠀⠈⠓⠀⢀⣀⠀⣼
-    ⢷⡀⠈⠙⠒⠒⠒⠋⠁⠈⣒⣤⣘⣧⣄⣀⠀⠀⢈⣻⠀⠀⠀⠀⠘⢥⣀⠀⠀⠀⠀⢹⡆⠀⢀⡴⠚⠉⣩⣷⠏
-    ⠈⠳⣤⡀⠀⠀⠀⠀⠀⠉⠀⠀⠀⠈⠉⠛⠫⡍⠉⠁⠀⡴⠒⠤⣤⡀⠈⠉⠉⠙⠛⠋⠁⠀⠺⠤⢖⣫⠟⠃⠀
-    ⠀⠀⠈⠙⠳⢦⣄⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠓⠒⠒⠃⠀⠀⠀⠀⠀⢀⣀⣤⠴⠞⠋⠁⠀⠀⠀
-    ⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠛⠛⠛⠛⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠛⠛⠛⠛⠛⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀`);
+    // warning(`
+    //     ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⠴⠶⠦⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+    // ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣀⣴⡯⠤⠴⠶⠶⠶⠿⠷⠶⠶⠦⠤⣴⠚⠛⠒⠶⣤⡀⠀⠀⠀⠀⠀⠀⠀
+    // ⠀⠀⠀⠀⢀⣀⣠⣄⣤⠶⢚⣯⠭⠤⠶⠤⢤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⢦⣀⡀⠀⠈⢹⣆⠀⠀⠀⠀⠀⠀
+    // ⠀⢀⡴⠞⠉⠀⠀⢀⡟⠀⢯⣄⣀⣀⣀⣀⣠⠿⠀⠀⢀⡤⠤⠒⠒⠒⠶⢤⡀⠈⠉⠉⣉⣭⣭⣗⣦⣄⡀⠀⠀
+    // ⠀⣟⣀⣀⣠⠴⠞⠉⠀⡠⠤⠶⠾⣍⡭⠥⠤⠤⣀⠀⠘⢧⣀⠀⠀⠀⠀⣀⣽⣀⣀⣈⣧⡀⠀⠀⠈⠙⢿⣦⡀
+    // ⣰⠋⠁⠀⠀⣀⣀⡀⠀⠀⠀⠀⠈⠁⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠉⡹⠛⠉⠀⠀⠈⠉⠻⣗⠲⠦⠤⠾⠋⢷
+    // ⡏⠀⣴⠋⠉⠁⠈⠉⣳⠀⠀⠀⢀⣠⠤⠶⠦⠤⣄⡀⠀⠀⠀⠀⠀⣀⠤⠴⠶⠦⣤⡀⠀⠀⠈⠓⠀⢀⣀⠀⣼
+    // ⢷⡀⠈⠙⠒⠒⠒⠋⠁⠈⣒⣤⣘⣧⣄⣀⠀⠀⢈⣻⠀⠀⠀⠀⠘⢥⣀⠀⠀⠀⠀⢹⡆⠀⢀⡴⠚⠉⣩⣷⠏
+    // ⠈⠳⣤⡀⠀⠀⠀⠀⠀⠉⠀⠀⠀⠈⠉⠛⠫⡍⠉⠁⠀⡴⠒⠤⣤⡀⠈⠉⠉⠙⠛⠋⠁⠀⠺⠤⢖⣫⠟⠃⠀
+    // ⠀⠀⠈⠙⠳⢦⣄⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠓⠒⠒⠃⠀⠀⠀⠀⠀⢀⣀⣤⠴⠞⠋⠁⠀⠀⠀
+    // ⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠛⠛⠛⠛⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠛⠛⠛⠛⠛⠉⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀`);
     for(var i=0;i<cookieJar.length;i++)
     {
         var cookieVal = cookieJar[i].split(";")[0];
diff --git a/roles.js b/roles.js
@@ -18,7 +18,7 @@ function checkForErrors(inBody) {
 }
 
 function debug(message) {
-    dbg.message("<ROLES> " + message,4);
+    logger.debug("<ROLES> " + message);
 }
 
 function help() {
diff --git a/sync-rest-fetch.js b/sync-rest-fetch.js
@@ -18,7 +18,7 @@ let cookieJar = [];
 let domain;
 
 function consolelog(message, level) {
-    dbg.message("<REST-FETCH>:" + message,level);
+    logger.debug("<REST-FETCH>:" + message,level);
 }
 
 function debug(message) {
diff --git a/themes.js b/themes.js
@@ -11,7 +11,7 @@ var prettyprint = false;
 var url;
 
 function debug(message) {
-    dbg.message("<THEMES> " + message,4);
+    logger.debug("<THEMES> " + message);
 }
 
 function help() {
diff --git a/users.js b/users.js
@@ -19,7 +19,7 @@ function checkForErrors(inBody)
 }
 
 function debug(message){
-    dbg.message("<USERS> " + message,4);
+    logger.debug("<USERS> " + message);
 }
 
 
diff --git a/wmiocli.js b/wmiocli.js
@@ -21,10 +21,10 @@ var experimental = require('./experimental.js');
 var hideExperimental = true;
 returnStart = 0;
 returnCount = 1000;
-const { setLogLevel } = require('./debug.js');
-const { isTypedArray } = require('util/types');
+log4js = require("log4js");
+logger = log4js.getLogger();
+logger.level="off";
 
-dbg = require('./debug.js');
 prettyprint = false;
 proxy = undefined;
 caCertFile = undefined;
@@ -99,19 +99,19 @@ function checkOptions() {
   else {
     switch (levelInput) {
       case "OFF":
-        dbg.setLogLevel(0);
+        logger.level= "off";
         break;
       case "ERROR":
-        dbg.setLogLevel(1);
+        logger.level = "error";
         break;
       case "WARN":
-        dbg.setLogLevel(2);
+        logger.level = "warn";
         break;
       case "INFO":
-        dbg.setLogLevel(3);
+        logger.level = "info";
         break;
       case "DEBUG":
-        dbg.setLogLevel(4);
+        logger.level = "debug";
         break;
       default:
         console.log("-level incorrectly set, should be one of: OFF, ERROR, WARN, INFO, DEBUG");
@@ -147,8 +147,9 @@ function checkOptions() {
 }
 
 function debug(message) {
-  dbg.message("<MAIN> " + message, 4);
+  logger.debug(message);
 }
+
 const program = new Command();
 
 program
diff --git a/workflow.js b/workflow.js
@@ -10,7 +10,7 @@ var domainName, username, password, timeout, prettyprint;
 var url;
 
 function debug(message) {
-    dbg.message("<WORKFLOW> " + message,4);
+    logger.debug("<WORKFLOW> " + message);
 }
 
 function help() {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ var prettyprint = false;`
`12`	`12`	`var url;`
`13`	`13`
`14`	`14`	`function debug(message) {`
`15`		`- dbg.message("<ACCOUNTS> " + message,4);`
	`15`	`+ logger.debug("<ACCOUNTS> " + message);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`function help() {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ var url;`
`13`	`13`	`var bearerToken;`
`14`	`14`
`15`	`15`	`function debug(message) {`
`16`		`- dbg.message("<IDM> " + message,4);`
	`16`	`+ logger.debug("<IDM> " + message);`
`17`	`17`	`}`
`18`	`18`	`function help() {`
`19`	`19`	return `
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ var domainName, username, password, timeout, prettyprint;`
`10`	`10`	`var url;`
`11`	`11`
`12`	`12`	`function debug(message) {`
`13`		`- dbg.message("<RECIPE> " + message,4);`
	`13`	`+ logger.debug("<RECIPE> " + message);`
`14`	`14`	`}`
`15`	`15`	`function help() {`
`16`	`16`	return `