moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dial down MRC logging

This commit is contained in:
David Stephens 2019-05-31 22:00:48 +01:00
parent b6d0d0d95e
commit 8153473b89
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/mrc.js
View File

@ -396,9 +396,7 @@ exports.getModule = class mrcModule extends MenuModule {
body: body body: body
}; };
this.log.debug({ message: message }, 'Sending message to MRC multiplexer');
// TODO: check socket still exists here // TODO: check socket still exists here
this.state.socket.write(JSON.stringify(message) + '\n'); this.state.socket.write(JSON.stringify(message) + '\n');
} }

19
core/servers/chat/mrc_multiplexer.js
View File

@ -34,11 +34,12 @@ exports.getModule = class MrcModule extends ServerModule {
super(); super();
this.log = Log.child( { server : 'MRC' } ); this.log = Log.child( { server : 'MRC' } );
this.config = Config();
const config = Config();
this.mrcConnectOpts = { this.mrcConnectOpts = {
host : this.config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net', host : config.chatServers.mrc.serverHostname || 'mrc.bottomlessabyss.net',
port : this.config.chatServers.mrc.serverPort || 5000, port : config.chatServers.mrc.serverPort || 5000,
retryDelay : this.config.chatServers.mrc.retryDelay || 10000 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' ); this.log.warn( { port : config.chatServers.mrc.multiplexerPort, server : ModuleInfo.name }, 'Invalid port' );
return cb(Errors.Invalid(`Invalid port: ${config.chatServers.mrc.multiplexerPort}`)); 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); return this.server.listen(port, cb);
} }
@ -135,11 +136,10 @@ exports.getModule = class MrcModule extends ServerModule {
if (this.mrcClient && this.mrcClient.requestedDisconnect) if (this.mrcClient && this.mrcClient.requestedDisconnect)
return; return;
this.log.info(this.mrcConnectOpts, 'Disconnected from MRC server, reconnecting'); this.log.info(this.mrcConnectOpts, 'Disconnected from MRC server, reconnecting');
this.log.debug('Waiting ' + this.mrcConnectOpts.retryDelay + 'ms before retrying'); this.log.debug('Waiting ' + this.mrcConnectOpts.retryDelay + 'ms before retrying');
setTimeout(function() { setTimeout(function() {
self.connectToMrc(); self.connectToMrc();
}, this.mrcConnectOpts.retryDelay); }, this.mrcConnectOpts.retryDelay);
@ -199,10 +199,8 @@ exports.getModule = class MrcModule extends ServerModule {
sendToClient(message) { sendToClient(message) {
connectedSockets.forEach( (client) => { 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' ) { 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'); 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') { } else if (message.from_user == 'SERVER' && message.body.toUpperCase() == 'PING') {
// reply to heartbeat // reply to heartbeat
// this.log.debug('Respond to heartbeat');
this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`); this.sendToMrcServer('CLIENT', '', 'SERVER', 'ALL', '', `IMALIVE:${siteName}`);
} else { } else {