From ae4658435943d4d842692cdc9a47753451a7a030 Mon Sep 17 00:00:00 2001
From: YourFriendlyNeighborhoodDealer <qminer@2girls1dj.com>
Date: Mon, 19 Aug 2019 10:43:03 +0200
Subject: [PATCH] Global logging

---
 modules/main.js     |  9 ---------
 modules/qmining.js  |  9 ---------
 modules/sio.js      |  9 ---------
 modules/stuff.js    |  9 ---------
 server.js           | 27 ++++++++++++++++++---------
 views/main/main.ejs |  2 +-
 6 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/modules/main.js b/modules/main.js
index 79fda89..aded561 100644
--- a/modules/main.js
+++ b/modules/main.js
@@ -28,17 +28,8 @@ const app = express()
 const logger = require('../utils/logger.js')
 // const utils = require('../utils/utils.js')
 // const actions = require('../utils/actions.js')
-const stat = require('../utils/stat.js')
-stat.Load()
 
 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/modules/qmining.js b/modules/qmining.js
index 1ed14ca..a8a98b0 100644
--- a/modules/qmining.js
+++ b/modules/qmining.js
@@ -31,8 +31,6 @@ const app = express()
 const logger = require('../utils/logger.js')
 const utils = require('../utils/utils.js')
 const actions = require('../utils/actions.js')
-const stat = require('../utils/stat.js')
-stat.Load()
 
 const recivedFiles = 'public/recivedfiles'
 const uloadFiles = 'public/f'
@@ -41,13 +39,6 @@ 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/modules/sio.js b/modules/sio.js
index bd6fceb..da6cc68 100644
--- a/modules/sio.js
+++ b/modules/sio.js
@@ -28,19 +28,10 @@ const app = express()
 
 const logger = require('../utils/logger.js')
 const utils = require('../utils/utils.js')
-const stat = require('../utils/stat.js')
-stat.Load()
 
 const uloadFiles = './public/f'
 
 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/modules/stuff.js b/modules/stuff.js
index 1321594..da321c1 100644
--- a/modules/stuff.js
+++ b/modules/stuff.js
@@ -27,19 +27,10 @@ const app = express()
 const logger = require('../utils/logger.js')
 // const utils = require('../utils/utils.js')
 // const actions = require('../utils/actions.js')
-const stat = require('../utils/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/server.js b/server.js
index 7bb582e..ec6b796 100644
--- a/server.js
+++ b/server.js
@@ -21,6 +21,8 @@
 const express = require('express')
 const vhost = require('vhost')
 const logger = require('./utils/logger.js')
+const stat = require('./utils/stat.js')
+stat.Load()
 
 const qmining = require('./modules/qmining.js').app
 const main = require('./modules/main.js').app
@@ -52,16 +54,23 @@ const port = 8080
 //   }
 // }
 
-express()
-  .use(vhost('qmining.frylabs.net', qmining))
-  .use(vhost('sio.frylabs.net', sio))
-  .use(vhost('stuff.frylabs.net', stuff))
-  .use(vhost('frylabs.net', main))
-  .use(vhost('qmining.tk', qmining))
-  .use(function (req, res, next) {
-    console.log(req)
+const app = express()
+
+app.use(function (req, res, next) {
+  res.on('finish', function () {
+    logger.LogReq(req, true, res.statusCode)
+    if (res.statusCode !== 404) { stat.LogStat(req.url) }
   })
-  .listen(port)
+  next()
+})
+
+app.use(vhost('qmining.frylabs.net', qmining))
+app.use(vhost('sio.frylabs.net', sio))
+app.use(vhost('stuff.frylabs.net', stuff))
+app.use(vhost('frylabs.net', main))
+app.use(vhost('qmining.tk', qmining))
+
+app.listen(port)
 
 logger.Log('Node version: ' + process.version)
 logger.Log('Listening on port: ' + port)
diff --git a/views/main/main.ejs b/views/main/main.ejs
index f614e2d..f55fbf0 100644
--- a/views/main/main.ejs
+++ b/views/main/main.ejs
@@ -25,7 +25,7 @@
 	</p>
 
 	<h2>
-		<a href="qmining.frylabs.net">QMining</a>
+		<a href="http://qmining.frylabs.net">QMining</a>
 	</h2>
 
     </hr>