Global logging

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: {

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: {

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: {

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: {

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)

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>