From 94b00b2dd201f925ead5b1619c83c3cdd1664e87 Mon Sep 17 00:00:00 2001 From: Jack Allnutt Date: Tue, 18 Feb 2014 19:43:06 +0000 Subject: [PATCH] Replace calls to console.log() with Winston.info() etc. --- package.json | 59 ++++++++++++++++++++------------------- server/configuration.js | 12 +++++--- server/identd.js | 7 +++-- server/irc/connection.js | 4 ++- server/irc/state.js | 4 ++- server/kiwi.js | 57 +++++++++++++++++++------------------ server/weblistener.js | 6 ++-- server_modules/control.js | 9 ++++-- 8 files changed, 88 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index cb988a7..40003fc 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,31 @@ -{ - "name": "kiwiirc", - "version": "0.8.2-dev", - "description": "A hand-crafted webirc client", - "homepage": "https://www.kiwiirc.com/", - "preferGlobal": "true", - "bin": { "kiwiirc": "./kiwi" }, - "repository" : { - "type": "git", - "url": "https://github.com/prawnsalad/KiwiIRC.git" - }, - "scripts": { - "postinstall": "node client/build.js" - }, - "dependencies": { - "node-static": "0.7.3", - "uglify-js": "2.4.12", - "engine.io": "0.7.9", - "lodash": "2.4.1", - "daemonize2": "0.4.2", - "eventemitter2": "0.4.13", - "ipaddr.js": "0.1.2", - "socksjs": "0.4.4", - "iconv-lite" : "0.2.11", - "spdy": "1.19.1", - "po2json": "0.2.3" - } -} +{ + "name": "kiwiirc", + "version": "0.8.2-dev", + "description": "A hand-crafted webirc client", + "homepage": "https://www.kiwiirc.com/", + "preferGlobal": "true", + "bin": { + "kiwiirc": "./kiwi" + }, + "repository": { + "type": "git", + "url": "https://github.com/prawnsalad/KiwiIRC.git" + }, + "scripts": { + "postinstall": "node client/build.js" + }, + "dependencies": { + "node-static": "0.7.3", + "uglify-js": "2.4.12", + "engine.io": "0.7.9", + "lodash": "2.4.1", + "daemonize2": "0.4.2", + "eventemitter2": "0.4.13", + "ipaddr.js": "0.1.2", + "socksjs": "0.4.4", + "iconv-lite": "0.2.11", + "spdy": "1.19.1", + "po2json": "0.2.3", + "winston": "~0.7.2" + } +} diff --git a/server/configuration.js b/server/configuration.js index 4f0ce03..f5f73c7 100644 --- a/server/configuration.js +++ b/server/configuration.js @@ -1,7 +1,8 @@ var fs = require('fs'), events = require('events'), util = require('util'), - path = require('path'); + path = require('path'), + winston = require('winston'); var config_filename = 'config.js', config_dirs = ['/etc/kiwiirc/', __dirname + '/../'], @@ -33,11 +34,13 @@ Config.prototype.loadConfig = function (manual_config_file) { this.manual_config_file = manual_config_file; } } catch (e) { - console.log('An error occured parsing the config file ' + manual_config_file + ': ' + e.message); + //console.log('An error occured parsing the config file ' + manual_config_file + ': ' + e.message); + winston.error('An error occured parsing the config file %s: %s', manual_config_file, e.message); process.exit(1); } } else { - console.log('Could not find config file ' + manual_config_file); + //console.log('Could not find config file ' + manual_config_file); + winston.error('Could not find config file %s', manual_config_file); process.exit(1); } } else { @@ -59,7 +62,8 @@ Config.prototype.loadConfig = function (manual_config_file) { case 'ENOENT': // No file/dir break; default: - console.log('An error occured parsing the config file ' + config_dirs[i] + config_filename + ': ' + e.message); + //console.log('An error occured parsing the config file ' + config_dirs[i] + config_filename + ': ' + e.message); + winston.warn('An error occured parsing the config file %s%s: %s', config_dirs[i], config_filename, e.message); return false; } continue; diff --git a/server/identd.js b/server/identd.js index 5c588e2..cb6e8d5 100644 --- a/server/identd.js +++ b/server/identd.js @@ -1,4 +1,5 @@ -var net = require('net'); +var net = require('net'), + winston = require('winston'); var IdentdServer = module.exports = function(opts) { @@ -44,7 +45,9 @@ var IdentdServer = module.exports = function(opts) { }); server.on('listening', function() { - console.log('Ident Server listening on ' + server.address().address + ':' + server.address().port); + var addr = server.address(); + //console.log('Ident Server listening on ' + server.address().address + ':' + server.address().port); + winston.info('Ident Server listening on %s:%s', addr.address, addr.port); }); diff --git a/server/irc/connection.js b/server/irc/connection.js index c0ca216..13c4d43 100644 --- a/server/irc/connection.js +++ b/server/irc/connection.js @@ -3,6 +3,7 @@ var net = require('net'), util = require('util'), dns = require('dns'), _ = require('lodash'), + winston = require('winston'), EventBinder = require('./eventbinder.js'), IrcServer = require('./server.js'), IrcCommands = require('./commands.js'), @@ -752,7 +753,8 @@ function parseIrcLine(buffer_line) { if (!msg) { // The line was not parsed correctly, must be malformed - console.log("Malformed IRC line: " + line.replace(/^\r+|\r+$/, '')); + //console.log("Malformed IRC line: " + line.replace(/^\r+|\r+$/, '')); + winston.warn('Malformed IRC line: %s', line.replace(/^\r+|\r+$/, '')); return; } diff --git a/server/irc/state.js b/server/irc/state.js index 7108d14..083bda9 100755 --- a/server/irc/state.js +++ b/server/irc/state.js @@ -1,6 +1,7 @@ var util = require('util'), events = require('events'), _ = require('lodash'), + winston = require('winston'), IrcConnection = require('./connection.js').IrcConnection; var State = function (client, save_state) { @@ -65,7 +66,8 @@ State.prototype.connect = function (hostname, port, ssl, nick, user, options, ca }); con.on('error', function IrcConnectionError(err) { - console.log('irc_connection error (' + hostname + '):', err); + //console.log('irc_connection error (' + hostname + '):', err); + winston.warn('irc_connection error (%s): %s', hostname, err); return callback(err.message); }); diff --git a/server/kiwi.js b/server/kiwi.js index 44c267e..8e0f29d 100755 --- a/server/kiwi.js +++ b/server/kiwi.js @@ -1,6 +1,7 @@ var fs = require('fs'), _ = require('lodash'), util = require('util'), + winston = require('winston'), WebListener = require('./weblistener.js'), config = require('./configuration.js'), modules = require('./modules.js'), @@ -35,22 +36,8 @@ if (process.argv.indexOf('-f') === -1 && global.config && global.config.log) { log_file_name = __dirname + '/../' + log_file_name; } - - - console.log = function() { - var logfile = fs.openSync(log_file_name, 'a'), - out; - - out = util.format.apply(util, arguments); - - // Make sure we out somthing to log and we have an open file - if (!out || !logfile) return; - - out += '\n'; - fs.writeSync(logfile, out, null); - - fs.closeSync(logfile); - }; + winston.add(winston.transports.File, { filename: log_file_name, json: false}); + winston.remove(winston.transports.Console); })(); } @@ -58,12 +45,14 @@ if (process.argv.indexOf('-f') === -1 && global.config && global.config.log) { // Make sure we have a valid config file and at least 1 server if (!global.config || Object.keys(global.config).length === 0) { - console.log('Couldn\'t find a valid config.js file (Did you copy the config.example.js file yet?)'); + //console.log('Couldn\'t find a valid config.js file (Did you copy the config.example.js file yet?)'); + winston.error('Couldn\'t find a valid config.js file (Did you copy the config.example.js file yet?)'); process.exit(1); } if ((!global.config.servers) || (global.config.servers.length < 1)) { - console.log('No servers defined in config file'); + //console.log('No servers defined in config file'); + winston.error('No servers defined in config file'); process.exit(2); } @@ -80,9 +69,11 @@ modules.registerPublisher(global.modules); if (global.config.module_dir) { (global.config.modules || []).forEach(function (module_name) { if (modules.load(module_name)) { - console.log('Module ' + module_name + ' loaded successfuly'); + //console.log('Module ' + module_name + ' loaded successfuly'); + winston.info('Module %s loaded successfully', module_name); } else { - console.log('Module ' + module_name + ' failed to load'); + //console.log('Module ' + module_name + ' failed to load'); + winston.warn('Module %s failed to load', module_name); } }); } @@ -247,7 +238,8 @@ _.each(global.config.servers, function (server) { serv.listen(server.port, server.address, server); serv.on('listening', function() { - console.log('Kiwi proxy listening on %s:%s %s SSL', server.address, server.port, (server.ssl ? 'with' : 'without')); + //console.log('Kiwi proxy listening on %s:%s %s SSL', server.address, server.port, (server.ssl ? 'with' : 'without')); + winston.info('Kiwi proxy listening on %s:%s %s SSL', server.address, server.port, (server.ssl ? 'with' : 'without')); }); serv.on('socket_connected', function(pipe) { @@ -277,12 +269,14 @@ _.each(global.config.servers, function (server) { }); wl.on('listening', function () { - console.log('Listening on %s:%s %s SSL', server.address, server.port, (server.ssl ? 'with' : 'without')); + //console.log('Listening on %s:%s %s SSL', server.address, server.port, (server.ssl ? 'with' : 'without')); + winston.info('Listening on %s:%s %s SSL', server.address, server.port, (server.ssl ? 'with' : 'without')); webListenerRunning(); }); wl.on('error', function (err) { - console.log('Error listening on %s:%s: %s', server.address, server.port, err.code); + //console.log('Error listening on %s:%s: %s', server.address, server.port, err.code); + winston.info('Error listening on %s:%s: %s', server.address, server.port, err.code); // TODO: This should probably be refactored. ^JA webListenerRunning(); }); @@ -321,23 +315,28 @@ function setProcessUid() { // Make sure Kiwi doesn't simply quit on an exception process.on('uncaughtException', function (e) { - console.log('[Uncaught exception] ' + e); - console.log(e.stack); + //console.log('[Uncaught exception] ' + e); + //console.log(e.stack); + winston.error('[Uncaught exception] %s', e, {stack: e.stack}); }); process.on('SIGUSR1', function() { if (config.loadConfig()) { - console.log('New config file loaded'); + //console.log('New config file loaded'); + winston.info('New config file loaded'); } else { - console.log("No new config file was loaded"); + //console.log("No new config file was loaded"); + winston.info('No new config file was loaded'); } }); process.on('SIGUSR2', function() { - console.log('Connected clients: ' + _.size(global.clients.clients).toString()); - console.log('Num. remote hosts: ' + _.size(global.clients.addresses).toString()); + //console.log('Connected clients: ' + _.size(global.clients.clients).toString()); + //console.log('Num. remote hosts: ' + _.size(global.clients.addresses).toString()); + winston.info('Connected clients: %s', _.size(global.clients.clients)); + winston.info('Num. remote hosts: %s', _.size(global.clients.addresses)); }); diff --git a/server/weblistener.js b/server/weblistener.js index 964118b..0525d9c 100644 --- a/server/weblistener.js +++ b/server/weblistener.js @@ -1,5 +1,5 @@ var engine = require('engine.io'), - WebsocketRpc = require('./websocketrpc.js'); + WebsocketRpc = require('./websocketrpc.js'), events = require('events'), http = require('http'), https = require('https'), @@ -10,6 +10,7 @@ var engine = require('engine.io'), _ = require('lodash'), spdy = require('spdy'), ipaddr = require('ipaddr.js'), + winston = require('winston'), Client = require('./client.js').Client, HttpHandler = require('./httphandler.js').HttpHandler, rehash = require('./rehash.js'); @@ -134,7 +135,8 @@ function initialiseSocket(socket, callback) { if (request.headers[global.config.http_proxy_ip_header || 'x-forwarded-for']) { // Check we're connecting from a whitelisted proxy if (!global.config.http_proxies || !rangeCheck(address, global.config.http_proxies)) { - console.log('Unlisted proxy:', address); + //console.log('Unlisted proxy:', address); + winston.info('Unlisted proxy: %s', address); callback(null, false); return; } diff --git a/server_modules/control.js b/server_modules/control.js index 8619be5..c9f8f7a 100644 --- a/server_modules/control.js +++ b/server_modules/control.js @@ -7,7 +7,8 @@ var net = require('net'), kiwiModules = require('../server/modules'), ControlInterface = require('../server/controlinterface.js'), - _ = require('lodash'); + _ = require('lodash'), + winston = require('winston'); var control_module = new kiwiModules.Module('Control'); @@ -22,7 +23,8 @@ function SocketClient (socket) { this.socket_closing = false; this.remoteAddress = this.socket.remoteAddress; - console.log('Control connection from ' + this.socket.remoteAddress + ' opened'); + //console.log('Control connection from ' + this.socket.remoteAddress + ' opened'); + winston.info('Control connection from %s opened', this.socket.remoteAddress); this.bindEvents(); @@ -53,7 +55,8 @@ SocketClient.prototype.onClose = function() { this.unbindEvents(); this.socket = null; - console.log('Control connection from ' + this.remoteAddress + ' closed'); + //console.log('Control connection from ' + this.remoteAddress + ' closed'); + winston.info('Control connection from %s closed', this.remoteAddress); }; -- 2.25.1