From 76190ef7d86dd30d04ce7807a2afc4aa894990a0 Mon Sep 17 00:00:00 2001
From: Esther <esther@pastel.codes>
Date: Mon, 22 Jun 2020 22:48:48 +0100
Subject: [PATCH] Fixed??

---
 app.js            | 34 ++++---------------------------
 config/winston.js | 52 ++++++++++++++++++-----------------------------
 2 files changed, 24 insertions(+), 62 deletions(-)

diff --git a/app.js b/app.js
index 27c60d1..c08f35d 100644
--- a/app.js
+++ b/app.js
@@ -2,8 +2,9 @@ var createError = require('http-errors');
 var express = require('express');
 var path = require('path');
 var cookieParser = require('cookie-parser');
+var mLogger = require('morgan');
 var sassMiddleware = require('node-sass-middleware');
-var winston = require('winston');
+var logger = require('./config/winston');
 
 var indexRouter = require('./routes/index');
 var aboutRouter = require('./routes/about');
@@ -17,37 +18,10 @@ app.disable('x-powered-by');
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'pug');
 
-var logger = new winston.Logger({
-    transports: [
-        new winston.transports.File({
-            level: 'info',
-            filename: './logs/all-logs.log',
-            handleExceptions: true,
-            json: true,
-            maxsize: 5242880, //5MB
-            maxFiles: 5,
-            colorize: false
-        }),
-        new ston.transportswin.Console({
-            level: 'debug',
-            handleExceptions: true,
-            json: false,
-            colorize: true
-        })
-    ],
-    exitOnError: false
-});
-
-logger.stream = {
-    write: function(message, encoding){
-        logger.info(message);
-    }
-};
-
 if (process.env.NODE_ENV === 'production') {
-    app.use(require("morgan")("common", { "stream": logger.stream }));
+    app.use(mLogger("common", { "stream": logger.stream }));
 } else {
-    app.use(require(morgan)('dev'));
+    app.use(mLogger('dev'));
 }
 
 app.use(express.json());
diff --git a/config/winston.js b/config/winston.js
index 143b7f0..91e6c86 100644
--- a/config/winston.js
+++ b/config/winston.js
@@ -1,41 +1,29 @@
-var appRoot = require('app-root-path');
 var winston = require('winston');
 
-// define the custom settings for each transport (file, console)
-var options = {
-    file: {
-        level: 'info',
-        filename: `${appRoot}/logs/app.log`,
-        handleExceptions: true,
-        json: true,
-        maxsize: 5242880, // 5MB
-        maxFiles: 5,
-        colorize: false,
-    },
-    console: {
-        level: 'debug',
-        handleExceptions: true,
-        json: false,
-        colorize: true,
-    },
-};
-
-// instantiate a new Winston Logger with the settings defined above
-let logger = winston.createLogger({
+var logger = new winston.createLogger({
     transports: [
-        new (winston.transports.Console)(options.console),
-        new (winston.transports.File)(options.errorFile),
-        new (winston.transports.File)(options.file)
+        new winston.transports.File({
+            level: 'info',
+            filename: './logs/all-logs.log',
+            handleExceptions: true,
+            json: true,
+            maxsize: 5242880, //5MB
+            maxFiles: 5,
+            colorize: false
+        }),
+        new winston.transports.Console({
+            level: 'debug',
+            handleExceptions: true,
+            json: false,
+            colorize: true
+        })
     ],
-    exitOnError: false, // do not exit on handled exceptions
+    exitOnError: false
 });
 
-// create a stream object with a 'write' function that will be used by `morgan`
 logger.stream = {
-    write: function(message, encoding) {
-        // use the 'info' log level so the output will be picked up by both transports (file and console)
+    write: function(message, encoding){
         logger.info(message);
-    },
+    }
 };
-
-module.exports = logger;
\ No newline at end of file
+module.exports = logger
\ No newline at end of file