Add HTTP request logging

Related to #27.
This commit is contained in:
Zalmoxisus 2016-11-09 13:49:24 +02:00
parent ee32bd52a6
commit 9c048e66ef
4 changed files with 9 additions and 1 deletions

View File

@ -19,6 +19,7 @@ module.exports = function getOptions(argv) {
}, },
dbOptions: dbOptions, dbOptions: dbOptions,
maxRequestBody: argv.passphrase || '16mb', maxRequestBody: argv.passphrase || '16mb',
logHTTPRequests: argv.logHTTPRequests,
logLevel: argv.logLevel || 3 logLevel: argv.logLevel || 3
}; };
} }

View File

@ -14,7 +14,6 @@ function error(msg) {
} }
function list(query, fields) { function list(query, fields) {
knex.select().from('remotedev_apps').then(function(r){ console.log(r) });
var r = knex.select(fields || baseFields).from(reports); var r = knex.select(fields || baseFields).from(reports);
if (query) return r.where(query); if (query) return r.where(query);
return r; return r;

View File

@ -2,6 +2,7 @@ var path = require('path');
var app = require('express')(); var app = require('express')();
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
var cors = require('cors'); var cors = require('cors');
var morgan = require('morgan');
var createStore = require('./store'); var createStore = require('./store');
module.exports.run = function(worker) { module.exports.run = function(worker) {
@ -9,6 +10,7 @@ module.exports.run = function(worker) {
var scServer = worker.scServer; var scServer = worker.scServer;
var store = createStore(worker.options); var store = createStore(worker.options);
var limit = worker.options.maxRequestBody; var limit = worker.options.maxRequestBody;
var logHTTPRequests = worker.options.logHTTPRequests;
httpServer.on('request', app); httpServer.on('request', app);
@ -19,6 +21,11 @@ module.exports.run = function(worker) {
res.render('index', { port: worker.options.port }); res.render('index', { port: worker.options.port });
}); });
if (logHTTPRequests) {
if (typeof logHTTPRequests === 'object') app.use(morgan('combined', logHTTPRequests));
else app.use(morgan('combined'));
}
app.use(cors({ methods: 'POST' })); app.use(cors({ methods: 'POST' }));
app.use(bodyParser.json({ limit: limit })); app.use(bodyParser.json({ limit: limit }));
app.use(bodyParser.urlencoded({ limit: limit, extended: false })); app.use(bodyParser.urlencoded({ limit: limit, extended: false }));

View File

@ -38,6 +38,7 @@
"knex": "^0.12.6", "knex": "^0.12.6",
"lodash": "^4.15.0", "lodash": "^4.15.0",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"morgan": "^1.7.0",
"node-uuid": "^1.4.0", "node-uuid": "^1.4.0",
"object-assign": "^4.0.0", "object-assign": "^4.0.0",
"repeat-string": "^1.5.4", "repeat-string": "^1.5.4",