From 1ebe645ac3cecb042c1ee7e7fd3dd3106570809c Mon Sep 17 00:00:00 2001
From: Gareth Jones <gareth.jones@shinetech.com>
Date: Thu, 8 Feb 2018 20:27:13 +1100
Subject: [PATCH 1/2] updated for log4js version 2.5.2

---
 config/log4js.json | 54 +++++++++++++++++++++++-----------------------
 package.json       | 11 +++++-----
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/config/log4js.json b/config/log4js.json
index 7cb4d05..d18d21e 100644
--- a/config/log4js.json
+++ b/config/log4js.json
@@ -1,29 +1,29 @@
 {
-  "appenders": [
-    {
-      "type": "clustered",
-      "appenders": [
-        {
-          "type": "dateFile",
-          "filename": "log/access.log",
-          "pattern": "-yyyy-MM-dd",
-          "category": "http"
-        },
-        {
-          "type": "file",
-          "filename": "log/app.log",
-          "maxLogSize": 10485760,
-          "numBackups": 3
-        },
-        {
-          "type": "logLevelFilter",
-          "level": "ERROR",
-          "appender": {
-            "type": "file",
-            "filename": "log/errors.log"
-          }
-        }
-      ]
+    "appenders": {
+      "access": {
+        "type": "dateFile",
+        "filename": "log/access.log",
+        "pattern": "-yyyy-MM-dd",
+        "category": "http"
+      },
+      "app": {
+        "type": "file",
+        "filename": "log/app.log",
+        "maxLogSize": 10485760,
+        "numBackups": 3
+      },
+      "errorFile": {
+        "type": "file",
+        "filename": "log/errors.log"
+      },
+      "errors": {
+        "type": "logLevelFilter",
+        "level": "ERROR",
+        "appender": "errorFile"
+      }
+    },
+    "categories": {
+      "default": { "appenders": [ "app", "errors" ], "level": "DEBUG" },
+      "http": { "appenders": [ "access"], "level": "DEBUG" }
     }
-  ]
-}
+  }
diff --git a/package.json b/package.json
index 0b0984f..f328310 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,18 @@
 {
   "name": "log4js-example",
   "version": "0.0.1",
-  "private": true,
+  "private": false,
   "scripts": {
     "start": "node ./bin/www"
   },
   "dependencies": {
-    "express": "~4.2.0",
+    "express": "~4.16.2",
     "static-favicon": "~1.0.0",
-    "morgan": "~1.0.0",
     "cookie-parser": "~1.0.1",
     "body-parser": "~1.0.0",
-    "debug": "~0.7.4",
+    "debug": "~3.1.0",
     "jade": "~1.3.0",
-    "log4js": "~0.6.15",
-    "express-cluster": "0.0.2"
+    "log4js": "~2.5.2",
+    "express-cluster": "0.0.5"
   }
 }

From d112d01c4bee4e1d6abab02012b3c80724016f28 Mon Sep 17 00:00:00 2001
From: Gareth Jones <gareth.jones@shinetech.com>
Date: Mon, 18 Feb 2019 08:57:31 +1100
Subject: [PATCH 2/2] updated dependencies, making sure it works with
 log4js@4.0.2

---
 .gitignore                        |  1 +
 app.js                            |  4 ++--
 package.json                      | 16 ++++++++--------
 views/{error.jade => error.pug}   |  0
 views/{index.jade => index.pug}   |  0
 views/{layout.jade => layout.pug} |  0
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename views/{error.jade => error.pug} (100%)
 rename views/{index.jade => index.pug} (100%)
 rename views/{layout.jade => layout.pug} (100%)

diff --git a/.gitignore b/.gitignore
index da23d0d..6c3ae93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ build/Release
 # Deployed apps should consider commenting this line out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
+package-lock.json
diff --git a/app.js b/app.js
index 11cb09a..f8b2586 100644
--- a/app.js
+++ b/app.js
@@ -16,7 +16,7 @@ var app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'jade');
+app.set('view engine', 'pug');
 
 app.use(favicon());
 
@@ -25,7 +25,7 @@ app.use(favicon());
 app.use(log4js.connectLogger(log4js.getLogger("http"), { level: 'auto' }));
 
 app.use(bodyParser.json());
-app.use(bodyParser.urlencoded());
+app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
diff --git a/package.json b/package.json
index f328310..dd23664 100644
--- a/package.json
+++ b/package.json
@@ -6,13 +6,13 @@
     "start": "node ./bin/www"
   },
   "dependencies": {
-    "express": "~4.16.2",
-    "static-favicon": "~1.0.0",
-    "cookie-parser": "~1.0.1",
-    "body-parser": "~1.0.0",
-    "debug": "~3.1.0",
-    "jade": "~1.3.0",
-    "log4js": "~2.5.2",
-    "express-cluster": "0.0.5"
+    "body-parser": "^1.18.3",
+    "cookie-parser": "^1.4.3",
+    "debug": "^3.2.6",
+    "express": "^4.16.4",
+    "express-cluster": "^0.0.5",
+    "log4js": "^4.0.2",
+    "pug": "^2.0.3",
+    "static-favicon": "^1.0.0"
   }
 }
diff --git a/views/error.jade b/views/error.pug
similarity index 100%
rename from views/error.jade
rename to views/error.pug
diff --git a/views/index.jade b/views/index.pug
similarity index 100%
rename from views/index.jade
rename to views/index.pug
diff --git a/views/layout.jade b/views/layout.pug
similarity index 100%
rename from views/layout.jade
rename to views/layout.pug