mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Global logging
This commit is contained in:
parent
857feda5fe
commit
ae46584359
6 changed files with 19 additions and 46 deletions
|
@ -28,17 +28,8 @@ const app = express()
|
||||||
const logger = require('../utils/logger.js')
|
const logger = require('../utils/logger.js')
|
||||||
// const utils = require('../utils/utils.js')
|
// const utils = require('../utils/utils.js')
|
||||||
// const actions = require('../utils/actions.js')
|
// const actions = require('../utils/actions.js')
|
||||||
const stat = require('../utils/stat.js')
|
|
||||||
stat.Load()
|
|
||||||
|
|
||||||
app.set('view engine', 'ejs')
|
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(express.static('public'))
|
||||||
app.use(busboy({
|
app.use(busboy({
|
||||||
limits: {
|
limits: {
|
||||||
|
|
|
@ -31,8 +31,6 @@ const app = express()
|
||||||
const logger = require('../utils/logger.js')
|
const logger = require('../utils/logger.js')
|
||||||
const utils = require('../utils/utils.js')
|
const utils = require('../utils/utils.js')
|
||||||
const actions = require('../utils/actions.js')
|
const actions = require('../utils/actions.js')
|
||||||
const stat = require('../utils/stat.js')
|
|
||||||
stat.Load()
|
|
||||||
|
|
||||||
const recivedFiles = 'public/recivedfiles'
|
const recivedFiles = 'public/recivedfiles'
|
||||||
const uloadFiles = 'public/f'
|
const uloadFiles = 'public/f'
|
||||||
|
@ -41,13 +39,6 @@ const dataFile = 'public/data.json'
|
||||||
const msgFile = 'stats/msgs'
|
const msgFile = 'stats/msgs'
|
||||||
|
|
||||||
app.set('view engine', 'ejs')
|
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(express.static('public'))
|
||||||
app.use(busboy({
|
app.use(busboy({
|
||||||
limits: {
|
limits: {
|
||||||
|
|
|
@ -28,19 +28,10 @@ const app = express()
|
||||||
|
|
||||||
const logger = require('../utils/logger.js')
|
const logger = require('../utils/logger.js')
|
||||||
const utils = require('../utils/utils.js')
|
const utils = require('../utils/utils.js')
|
||||||
const stat = require('../utils/stat.js')
|
|
||||||
stat.Load()
|
|
||||||
|
|
||||||
const uloadFiles = './public/f'
|
const uloadFiles = './public/f'
|
||||||
|
|
||||||
app.set('view engine', 'ejs')
|
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(express.static('public'))
|
||||||
app.use(busboy({
|
app.use(busboy({
|
||||||
limits: {
|
limits: {
|
||||||
|
|
|
@ -27,19 +27,10 @@ const app = express()
|
||||||
const logger = require('../utils/logger.js')
|
const logger = require('../utils/logger.js')
|
||||||
// const utils = require('../utils/utils.js')
|
// const utils = require('../utils/utils.js')
|
||||||
// const actions = require('../utils/actions.js')
|
// const actions = require('../utils/actions.js')
|
||||||
const stat = require('../utils/stat.js')
|
|
||||||
stat.Load()
|
|
||||||
|
|
||||||
const listedFiles = './public/files'
|
const listedFiles = './public/files'
|
||||||
|
|
||||||
app.set('view engine', 'ejs')
|
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(express.static('public'))
|
||||||
app.use(busboy({
|
app.use(busboy({
|
||||||
limits: {
|
limits: {
|
||||||
|
|
27
server.js
27
server.js
|
@ -21,6 +21,8 @@
|
||||||
const express = require('express')
|
const express = require('express')
|
||||||
const vhost = require('vhost')
|
const vhost = require('vhost')
|
||||||
const logger = require('./utils/logger.js')
|
const logger = require('./utils/logger.js')
|
||||||
|
const stat = require('./utils/stat.js')
|
||||||
|
stat.Load()
|
||||||
|
|
||||||
const qmining = require('./modules/qmining.js').app
|
const qmining = require('./modules/qmining.js').app
|
||||||
const main = require('./modules/main.js').app
|
const main = require('./modules/main.js').app
|
||||||
|
@ -52,16 +54,23 @@ const port = 8080
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
express()
|
const app = express()
|
||||||
.use(vhost('qmining.frylabs.net', qmining))
|
|
||||||
.use(vhost('sio.frylabs.net', sio))
|
app.use(function (req, res, next) {
|
||||||
.use(vhost('stuff.frylabs.net', stuff))
|
res.on('finish', function () {
|
||||||
.use(vhost('frylabs.net', main))
|
logger.LogReq(req, true, res.statusCode)
|
||||||
.use(vhost('qmining.tk', qmining))
|
if (res.statusCode !== 404) { stat.LogStat(req.url) }
|
||||||
.use(function (req, res, next) {
|
|
||||||
console.log(req)
|
|
||||||
})
|
})
|
||||||
.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('Node version: ' + process.version)
|
||||||
logger.Log('Listening on port: ' + port)
|
logger.Log('Listening on port: ' + port)
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2>
|
<h2>
|
||||||
<a href="qmining.frylabs.net">QMining</a>
|
<a href="http://qmining.frylabs.net">QMining</a>
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
</hr>
|
</hr>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue