suppress winston on polling

This commit is contained in:
Josh Harvey 2016-12-06 02:30:04 +02:00
parent 5f72139d53
commit d38ee58ec4
3 changed files with 16 additions and 8 deletions

View file

@ -1,11 +1,8 @@
const winston = require('winston') const winston = require('winston')
const options = require('./options')
var logLevel = typeof process.env.LAMASSU_ENV === 'string'
? process.env.LAMASSU_ENV
: 'info'
const logger = new winston.Logger({ const logger = new winston.Logger({
level: logLevel, level: options.logLevel,
transports: [ transports: [
new (winston.transports.Console)({timestamp: true, colorize: true}) new (winston.transports.Console)({timestamp: true, colorize: true})
] ]

View file

@ -1,6 +1,8 @@
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const os = require('os') const os = require('os')
const _ = require('lodash/fp')
const argv = require('minimist')(process.argv.slice(2))
let serverConfig let serverConfig
@ -17,4 +19,7 @@ try {
} }
} }
module.exports = serverConfig const defaults = {logLevel: 'info'}
const commandLine = {logLevel: argv.logLevel}
module.exports = _.mergeAll([defaults, serverConfig, commandLine])

View file

@ -4,6 +4,9 @@ const morgan = require('morgan')
const helmet = require('helmet') const helmet = require('helmet')
const bodyParser = require('body-parser') const bodyParser = require('body-parser')
const BigNumber = require('bignumber.js') const BigNumber = require('bignumber.js')
const _ = require('lodash/fp')
const options = require('./options')
const logger = require('./logger') const logger = require('./logger')
const configManager = require('./config-manager') const configManager = require('./config-manager')
const db = require('./db') const db = require('./db')
@ -24,7 +27,6 @@ const pids = {}
const reboots = {} const reboots = {}
function poll (req, res, next) { function poll (req, res, next) {
console.log('DEBUG77')
const deviceId = req.deviceId const deviceId = req.deviceId
const deviceTime = req.deviceTime const deviceTime = req.deviceTime
const pid = req.query.pid const pid = req.query.pid
@ -315,6 +317,10 @@ function authorize (req, res, next) {
function init (opts) { function init (opts) {
plugins = opts.plugins plugins = opts.plugins
const skip = options.logLevel === 'debug'
? () => false
: req => _.includes(req.path, ['/poll', '/state'])
const app = opts.app const app = opts.app
const localApp = opts.localApp const localApp = opts.localApp
@ -322,7 +328,7 @@ function init (opts) {
? (req, res, next) => next() ? (req, res, next) => next()
: authorize : authorize
app.use(morgan('dev')) app.use(morgan('dev', {skip}))
app.use(helmet()) app.use(helmet())
app.use(populateDeviceId) app.use(populateDeviceId)
app.use(bodyParser.json()) app.use(bodyParser.json())