From 8b866bb0b577e55c58d762c95f0bc36e82301a94 Mon Sep 17 00:00:00 2001
From: Joshua Treudler <joshua@treudler.net>
Date: Tue, 27 Aug 2024 14:45:46 +0200
Subject: [PATCH] move winston logger

---
 server/dbInit.js        |  5 +++--
 server/index.js         | 21 +--------------------
 server/winstonLogger.js | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 server/winstonLogger.js

diff --git a/server/dbInit.js b/server/dbInit.js
index 2ec61b8..fbf60fb 100644
--- a/server/dbInit.js
+++ b/server/dbInit.js
@@ -1,4 +1,5 @@
 const mysql = require('mysql');
+const logger = require('./winstonLogger');
 
 require('dotenv').config();
 const DB_HOST = process.env.DB_HOST;
@@ -17,10 +18,10 @@ const connection = mysql.createConnection({
 
 connection.connect((err) => {
 if (err) {
-    console.error('Error connecting to the database: ' + err.stack);
+    logger.error('Error connecting to database: ' + err);
     return;
 }
-console.log('Connected to the database as id ' + connection.threadId);
+logger.info('Connected to database ' + DB_NAME + ' on ' + DB_HOST + ':' + DB_PORT + ' as user ' + DB_USER);
 });
   
 module.exports = connection;
\ No newline at end of file
diff --git a/server/index.js b/server/index.js
index 7f555de..58d606e 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,26 +1,7 @@
 // this nodejs server will serve a rest api for the frontend to consume
 // everything will be in one file for simplicity
 
-// Winston logger
-const winston = require('winston');
-
-const logger = winston.createLogger({
-  level: 'info',
-  format: winston.format.combine(
-    winston.format.timestamp(),
-    winston.format.json()
-  ),
-  transports: [
-    new winston.transports.File({ filename: 'error.log', level: 'error' }),
-    new winston.transports.File({ filename: 'combined.log' }),
-  ],
-});
-
-if (process.env.NODE_ENV !== 'production') {
-  logger.add(new winston.transports.Console({
-    format: winston.format.simple(),
-  }));
-}
+const logger = require('./winstonLogger');
 
 // Environment variables
 require('dotenv').config();
diff --git a/server/winstonLogger.js b/server/winstonLogger.js
new file mode 100644
index 0000000..1df89ff
--- /dev/null
+++ b/server/winstonLogger.js
@@ -0,0 +1,24 @@
+// Winston logger
+const winston = require('winston');
+
+const logger = winston.createLogger({
+  level: 'info',
+  format: winston.format.combine(
+    winston.format.timestamp(),
+    winston.format.json()
+  ),
+  transports: [
+    new winston.transports.File({ filename: 'error.log', level: 'error' }),
+    new winston.transports.File({ filename: 'combined.log' }),
+  ],
+});
+
+
+if (process.env.NODE_ENV !== 'production') {
+    console.log('Not in production');
+    logger.add(new winston.transports.Console({
+    format: winston.format.simple(),
+    }));
+}
+
+module.exports = logger;
\ No newline at end of file