From 4451c120db97170d48d940db7a44eca1801e6e63 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 20 Aug 2014 10:54:51 -0400 Subject: [PATCH] remove logs --- app/controllers/socket.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/app/controllers/socket.js b/app/controllers/socket.js index aea8056..9220cf2 100644 --- a/app/controllers/socket.js +++ b/app/controllers/socket.js @@ -7,17 +7,24 @@ var mdb = require('../../lib/MessageDb').default(); var microtime = require('microtime'); var enableMessageBroker; +var verbose = false; +var log = function() { + if (verbose) { + console.log(arguments); + } +} + module.exports.init = function(io_ext, config) { enableMessageBroker = config ? config.enableMessageBroker : false; ios = io_ext; if (ios) { // when a new socket connects ios.sockets.on('connection', function(socket) { - console.log('New connection from ' + socket.id); + log('New connection from ' + socket.id); // when it subscribes, make it join the according room socket.on('subscribe', function(topic) { if (socket.rooms.length === 1) { - console.log('subscribe to ' + topic); + log('subscribe to ' + topic); socket.join(topic); } }); @@ -25,8 +32,8 @@ module.exports.init = function(io_ext, config) { if (enableMessageBroker) { // when it requests sync, send him all pending messages socket.on('sync', function(ts) { - console.log('Sync requested by ' + socket.id); - console.log(' from timestamp '+ts); + log('Sync requested by ' + socket.id); + log(' from timestamp '+ts); var rooms = socket.rooms; if (rooms.length !== 2) { socket.emit('insight-error', 'Must subscribe with public key before syncing'); @@ -34,12 +41,12 @@ module.exports.init = function(io_ext, config) { } var to = rooms[1]; var upper_ts = Math.round(microtime.now()); - console.log(' to timestamp '+upper_ts); + log(' to timestamp '+upper_ts); mdb.getMessages(to, ts, upper_ts, function(err, messages) { if (err) { throw new Error('Couldn\'t get messages on sync request: ' + err); } - console.log('\tFound ' + messages.length + ' message' + (messages.length !== 1 ? 's' : '')); + log('\tFound ' + messages.length + ' message' + (messages.length !== 1 ? 's' : '')); for (var i = 0; i < messages.length; i++) { broadcastMessage(messages[i], socket); } @@ -48,7 +55,7 @@ module.exports.init = function(io_ext, config) { // when it sends a message, add it to db socket.on('message', function(m) { - console.log('Message sent from ' + m.pubkey + ' to ' + m.to); + log('Message sent from ' + m.pubkey + ' to ' + m.to); mdb.addMessage(m, function(err) { if (err) { throw new Error('Couldn\'t add message to database: ' + err); @@ -59,7 +66,7 @@ module.exports.init = function(io_ext, config) { // disconnect handler socket.on('disconnect', function() { - console.log('disconnected ' + socket.id); + log('disconnected ' + socket.id); }); } }); @@ -115,7 +122,7 @@ module.exports.broadcastSyncInfo = function(historicSync) { var broadcastMessage = module.exports.broadcastMessage = function(message, socket) { if (ios) { var s = socket || ios.sockets.in(message.to); - console.log('sending message to ' + message.to); + log('sending message to ' + message.to); s.emit('message', message); }