From fe261c34bbc42011a4cf89c9abba8b99509ca4b6 Mon Sep 17 00:00:00 2001 From: ansuz Date: Sat, 14 May 2016 12:47:59 +0200 Subject: [PATCH] set log level via the config file, not via a constant --- NetfluxWebsocketSrv.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js index 13ec51cca..6fad102ed 100644 --- a/NetfluxWebsocketSrv.js +++ b/NetfluxWebsocketSrv.js @@ -2,13 +2,13 @@ const Crypto = require('crypto'); const LogStore = require('./storage/LogStore'); + const LAG_MAX_BEFORE_DISCONNECT = 30000; const LAG_MAX_BEFORE_PING = 15000; const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex'); const USE_HISTORY_KEEPER = true; const USE_FILE_BACKUP_STORAGE = true; -const LOG_MESSAGES = false; let dropUser; @@ -17,7 +17,7 @@ const now = function () { return (new Date()).getTime(); }; const sendMsg = function (ctx, user, msg) { try { - if (LOG_MESSAGES) { console.log('<' + JSON.stringify(msg)); } + if (ctx.config.logToStdout) { console.log('<' + JSON.stringify(msg)); } user.socket.send(JSON.stringify(msg)); } catch (e) { console.log(e.stack); @@ -153,11 +153,12 @@ const handleMessage = function (ctx, user, msg) { } }; -let run = module.exports.run = function (storage, socketServer) { +let run = module.exports.run = function (storage, socketServer, config) { let ctx = { users: {}, channels: {}, - store: (USE_FILE_BACKUP_STORAGE) ? LogStore.create('messages.log', storage) : storage + store: (USE_FILE_BACKUP_STORAGE) ? LogStore.create('messages.log', storage) : storage, + config: config }; setInterval(function () { Object.keys(ctx.users).forEach(function (userId) { @@ -183,7 +184,7 @@ let run = module.exports.run = function (storage, socketServer) { ctx.users[user.id] = user; sendMsg(ctx, user, [0, '', 'IDENT', user.id]); socket.on('message', function(message) { - if (LOG_MESSAGES) { console.log('>'+message); } + if (ctx.config.logToStdout) { console.log('>'+message); } try { handleMessage(ctx, user, message); } catch (e) {