From 3ab3cfea3b48cde46bdffa428d27a0e8ef2a21a4 Mon Sep 17 00:00:00 2001
From: YourFriendlyNeighborhoodDealer <qminer@2girls1dj.com>
Date: Wed, 14 Aug 2019 10:09:34 +0200
Subject: [PATCH] Removed logging in main

---
 main.js    |  9 +++++++++
 qmining.js |  9 +++++++++
 server.js  | 16 ----------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/main.js b/main.js
index 918a065..a2af133 100644
--- a/main.js
+++ b/main.js
@@ -27,10 +27,19 @@ const app = express()
 const logger = require('./logger.js')
 // const utils = require('./utils.js')
 // const actions = require('./actions.js')
+const stat = require('./stat.js')
+stat.Load()
 
 const listedFiles = './public/files'
 
 app.set('view engine', 'ejs')
+app.use(function (req, res, next) {
+  res.on('finish', function () {
+    logger.LogReq(req, true, res.statusCode)
+    if (res.statusCode !== 404) { stat.LogStat(req.url) }
+  })
+  next()
+})
 app.use(express.static('public'))
 app.use(busboy({
   limits: {
diff --git a/qmining.js b/qmining.js
index c40b19d..142fbb8 100644
--- a/qmining.js
+++ b/qmining.js
@@ -31,6 +31,8 @@ const app = express()
 const logger = require('./logger.js')
 const utils = require('./utils.js')
 const actions = require('./actions.js')
+const stat = require('./stat.js')
+stat.Load()
 
 const recivedFiles = 'public/recivedfiles'
 const uloadFiles = 'public/f'
@@ -39,6 +41,13 @@ const dataFile = 'public/data.json'
 const msgFile = 'stats/msgs'
 
 app.set('view engine', 'ejs')
+app.use(function (req, res, next) {
+  res.on('finish', function () {
+    logger.LogReq(req, true, res.statusCode)
+    if (res.statusCode !== 404) { stat.LogStat(req.url) }
+  })
+  next()
+})
 app.use(express.static('public'))
 app.use(busboy({
   limits: {
diff --git a/server.js b/server.js
index 0ced543..ad75b29 100644
--- a/server.js
+++ b/server.js
@@ -25,24 +25,8 @@ const logger = require('./logger.js')
 const qmining = require('./qmining.js').app
 const main = require('./main.js').app
 
-const stat = require('./stat.js')
-stat.Load()
-
 const port = 8080
 
-function AddLogger (app) {
-  app.use(function (req, res, next) {
-    res.on('finish', function () {
-      logger.LogReq(req, true, res.statusCode)
-      if (res.statusCode !== 404) { stat.LogStat(req.url) }
-    })
-    next()
-  })
-}
-
-AddLogger(qmining)
-AddLogger(main)
-
 // // https://certbot.eff.org/
 // const privkeyFile = '/etc/letsencrypt/live/qmining.tk/privkey.pem'
 // const fullchainFile = '/etc/letsencrypt/live/qmining.tk/fullchain.pem'