From 8153473b89f4dfab160bf7b74c35e4cee6315be8 Mon Sep 17 00:00:00 2001
From: David Stephens <dave@force9.org>
Date: Fri, 31 May 2019 22:00:48 +0100
Subject: [PATCH] Dial down MRC logging

---
 core/mrc.js                          |  2 --
 core/servers/chat/mrc_multiplexer.js | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/mrc.js b/core/mrc.js
index 172466a9..bca11656 100644
--- a/core/mrc.js
+++ b/core/mrc.js
@@ -396,9 +396,7 @@ exports.getModule = class mrcModule extends MenuModule {
             body: body
         };
 
-        this.log.debug({ message: message }, 'Sending message to MRC multiplexer');
         // TODO: check socket still exists here
-
         this.state.socket.write(JSON.stringify(message) + '\n');
     }
 
diff --git a/core/servers/chat/mrc_multiplexer.js b/core/servers/chat/mrc_multiplexer.js
index 2b7c54a3..69b3b248 100644
--- a/core/servers/chat/mrc_multiplexer.js
+++ b/core/servers/chat/mrc_multiplexer.js
@@ -34,11 +34,12 @@ exports.getModule = class MrcModule extends ServerModule {
         super();
 
         this.log            = Log.child( { server : 'MRC' } );
-        this.config         = Config();
+
+        const config        = Config();
         this.mrcConnectOpts = {
-            host         : this.config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
-            port         : this.config.chatServers.mrc.serverPort || 5000,
-            retryDelay   : this.config.chatServers.mrc.retryDelay || 10000
+            host         : config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
+            port         : config.chatServers.mrc.serverPort || 5000,
+            retryDelay   : config.chatServers.mrc.retryDelay || 10000
         };
     }
 
@@ -78,7 +79,7 @@ exports.getModule = class MrcModule extends ServerModule {
             this.log.warn( { port : config.chatServers.mrc.multiplexerPort, server : ModuleInfo.name }, 'Invalid port' );
             return cb(Errors.Invalid(`Invalid port: ${config.chatServers.mrc.multiplexerPort}`));
         }
-        Log.info( { server : ModuleInfo.name, port : config.chatServers.mrc.multiplexerPort }, 'MRC multiplexer local listener starting up');
+        Log.info( { server : ModuleInfo.name, port : config.chatServers.mrc.multiplexerPort }, 'MRC multiplexer starting up');
         return this.server.listen(port, cb);
     }
 
@@ -135,11 +136,10 @@ exports.getModule = class MrcModule extends ServerModule {
 
             if (this.mrcClient && this.mrcClient.requestedDisconnect)
                 return;
+
             this.log.info(this.mrcConnectOpts, 'Disconnected from MRC server, reconnecting');
-
             this.log.debug('Waiting ' + this.mrcConnectOpts.retryDelay + 'ms before retrying');
 
-
             setTimeout(function() {
                 self.connectToMrc();
             }, this.mrcConnectOpts.retryDelay);
@@ -199,10 +199,8 @@ exports.getModule = class MrcModule extends ServerModule {
     sendToClient(message) {
         connectedSockets.forEach( (client) => {
             if (message.to_user == '' || message.to_user == client.username || message.to_user == 'CLIENT' || message.from_user == client.username || message.to_user == 'NOTME' ) {
-                this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user');
+                // this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Forwarding message to connected user');
                 client.write(JSON.stringify(message) + '\n');
-            } else {
-                this.log.debug({ server : 'MRC', username : client.username, message : message }, 'Not forwarding message');
             }
         });
     }
@@ -225,7 +223,6 @@ exports.getModule = class MrcModule extends ServerModule {
 
         } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
             // reply to heartbeat
-            // this.log.debug('Respond to heartbeat');
             this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
 
         } else {