Merge pull request #24 from SoftwareAG/log4js

Logging switch to log4js

Author: sagpembo

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() {

experimental.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(){

flowservice.js

@@ -13,7 +13,7 @@ var url;
 var bearerToken;
 
 function debug(message) {
-    dbg.message("<IDM> " + message,4);
+    logger.debug("<IDM> " + message);
 }
 function help() {
     return `

idm.js

@@ -12,7 +12,7 @@ var prettyprint = false;
 var url;
 
 function debug(message) {
-    dbg.message("<MONITOR> " + message,4);
+    logger.debug("<MONITOR> " + message);
 }
 
 function help() {

monitor.js

@@ -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"

package-lock.json

@@ -12,7 +12,7 @@ var prettyprint = false;
 var url;
 
 function debug(message) {
-    dbg.message("<PROJECTS> " + message,4);
+    logger.debug("<PROJECTS> " + message,4);
 }
 
 function help() {

package.json

@@ -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 `

projects.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];