Merge pull request #26 from Codecontrol-Oy/log4js-fix

ToniIltanen · web-flow · commit 14bbcfdfb7d0 · 2022-03-15T13:34:21.000+02:00
Log4js fix
diff --git a/.DS_Store b/.DS_Store
diff --git a/Readme.MD b/Readme.MD
@@ -62,11 +62,10 @@ example settings.json (under the config directory)
                     "categories": { 
                         "default": { 
                             "appenders": ["node-gateway"], 
-                            "level": "info" 
+                            "level": "ERROR" 
                         } 
                     }
-            },
-            "loglevel" : "DEBUG"
+            }
         }
     }
 ```
diff --git a/config/settings.json b/config/settings.json
@@ -26,11 +26,10 @@
                         "appenders": [
                             "node-gateway"
                         ],
-                        "level": "info"
+                        "level": "ALL"
                     }
                 }
-            },
-            "loglevel": "DEBUG"
+            }
         }
     }
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codecontrol/node-gateway",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "A Simple NodeJS based proxy gateway",
   "keywords": [
     "gateway",
diff --git a/schemas/logger.json b/schemas/logger.json
@@ -4,8 +4,7 @@
 	"type": "object",
 	"$schema": "http://json-schema.org/draft-07/schema#",
 	"required": [
-		"logconfig",
-		"loglevel"
+		"logconfig"
 	],
 	"properties": {
 		"logconfig": {
@@ -16,11 +15,6 @@
 				}
 			},
 			"description": "Log4js settings"
-		},
-		"loglevel": {
-			"type": "string",
-			"description": "Logging level",
-			"pattern": "^(DEBUG|INFO|WARNING|ERROR)$"
 		}
 	}
 }
diff --git a/server.js b/server.js
@@ -44,8 +44,6 @@ const configureWebsockets = (server, config) => {
   server.on('upgrade', function (req, socket, head) {
     this.logger = log4js.getLogger("node-gateway")
     proxy.on("error", (err, req, res) => returnWebSocketInternalServerError(err, socket, config, this.logger))
-
-    this.logger = log4js.getLogger("node-gateway")
     var target = proxyRules.match(req);
     if (target) {
       return proxy.ws(req, socket, head,{

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,10 @@ example settings.json (under the config directory)`
`62`	`62`	`"categories": {`
`63`	`63`	`"default": {`
`64`	`64`	`"appenders": ["node-gateway"],`
`65`		`- "level": "info"`
	`65`	`+ "level": "ERROR"`
`66`	`66`	`}`
`67`	`67`	`}`
`68`		`- },`
`69`		`- "loglevel" : "DEBUG"`
	`68`	`+ }`
`70`	`69`	`}`
`71`	`70`	`}`
`72`	`71`	```
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,10 @@`
`26`	`26`	`"appenders": [`
`27`	`27`	`"node-gateway"`
`28`	`28`	`],`
`29`		`- "level": "info"`
	`29`	`+ "level": "ALL"`
`30`	`30`	`}`
`31`	`31`	`}`
`32`		`- },`
`33`		`- "loglevel": "DEBUG"`
	`32`	`+ }`
`34`	`33`	`}`
`35`	`34`	`}`
`36`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@codecontrol/node-gateway",`
`3`		`- "version": "1.3.8",`
	`3`	`+ "version": "1.3.9",`
`4`	`4`	`"description": "A Simple NodeJS based proxy gateway",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"gateway",`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`"type": "object",`
`5`	`5`	`"$schema": "http://json-schema.org/draft-07/schema#",`
`6`	`6`	`"required": [`
`7`		`- "logconfig",`
`8`		`- "loglevel"`
	`7`	`+ "logconfig"`
`9`	`8`	`],`
`10`	`9`	`"properties": {`
`11`	`10`	`"logconfig": {`
`@@ -16,11 +15,6 @@`
`16`	`15`	`}`
`17`	`16`	`},`
`18`	`17`	`"description": "Log4js settings"`
`19`		`- },`
`20`		`- "loglevel": {`
`21`		`- "type": "string",`
`22`		`- "description": "Logging level",`
`23`		`- "pattern": "^(DEBUG\|INFO\|WARNING\|ERROR)$"`
`24`	`18`	`}`
`25`	`19`	`}`
`26`	`20`	`}`