diff --git a/lib/options.js b/lib/options.js index 8d96b34..b80396b 100644 --- a/lib/options.js +++ b/lib/options.js @@ -19,6 +19,7 @@ module.exports = function getOptions(argv) { }, dbOptions: dbOptions, maxRequestBody: argv.passphrase || '16mb', + logHTTPRequests: argv.logHTTPRequests, logLevel: argv.logLevel || 3 }; } diff --git a/lib/store.js b/lib/store.js index 78866f7..e716588 100644 --- a/lib/store.js +++ b/lib/store.js @@ -14,7 +14,6 @@ function error(msg) { } function list(query, fields) { - knex.select().from('remotedev_apps').then(function(r){ console.log(r) }); var r = knex.select(fields || baseFields).from(reports); if (query) return r.where(query); return r; diff --git a/lib/worker.js b/lib/worker.js index 6c4a21d..0625406 100644 --- a/lib/worker.js +++ b/lib/worker.js @@ -2,6 +2,7 @@ var path = require('path'); var app = require('express')(); var bodyParser = require('body-parser'); var cors = require('cors'); +var morgan = require('morgan'); var createStore = require('./store'); module.exports.run = function(worker) { @@ -9,6 +10,7 @@ module.exports.run = function(worker) { var scServer = worker.scServer; var store = createStore(worker.options); var limit = worker.options.maxRequestBody; + var logHTTPRequests = worker.options.logHTTPRequests; httpServer.on('request', app); @@ -19,6 +21,11 @@ module.exports.run = function(worker) { 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(bodyParser.json({ limit: limit })); app.use(bodyParser.urlencoded({ limit: limit, extended: false })); diff --git a/package.json b/package.json index d570c4b..65550c1 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "knex": "^0.12.6", "lodash": "^4.15.0", "minimist": "^1.2.0", + "morgan": "^1.7.0", "node-uuid": "^1.4.0", "object-assign": "^4.0.0", "repeat-string": "^1.5.4",