Finalising winston logging; Logging timestamp format;

diff --git a/server/configuration.js b/server/configuration.js
index f5f73c7453c67e0312ae28017d41552ed86e236d..12959c686083e5fc79575ff6c97f042ce3f090f2 100644 (file)
--- a/server/configuration.js
+++ b/server/configuration.js
@@ -34,12 +34,10 @@ 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);
                 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);
             winston.error('Could not find config file %s', manual_config_file);
             process.exit(1);
         }
@@ -62,7 +60,6 @@ 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);
                     winston.warn('An error occured parsing the config file %s%s: %s', config_dirs[i], config_filename, e.message);
                     return false;
                 }
@@ -90,7 +87,7 @@ Config.prototype.setEnvironment = function (new_environment) {
 // Get the current config. Optionally for a different environment than currently set
 Config.prototype.get = function (specific_environment) {
     specific_environment = specific_environment || environment;
-    
+
     return loaded_config[specific_environment] || {};
 };
 

diff --git a/server/identd.js b/server/identd.js
index cb6e8d578276dde56281ffaaec9f5a62a5d364aa..692bbc9cc14edf4f364d931289e92cd42c023f54 100644 (file)
--- a/server/identd.js
+++ b/server/identd.js
@@ -46,7 +46,6 @@ var IdentdServer = module.exports = function(opts) {
 
     server.on('listening', function() {
         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);
     });
 
@@ -62,7 +61,7 @@ var IdentdServer = module.exports = function(opts) {
 
     /**
      * Process a line of data for an Identd response
-     * 
+     *
      * @param {String} The line of data to process
      * @return {String} Data to send back to the Identd client
      */

diff --git a/server/irc/connection.js b/server/irc/connection.js
index b764a1bde5860443cc28b60a19d1f8f8b0aff2c9..cea63de33aed5dc5d93b00c4f3edeca4d88e939e 100644 (file)
--- a/server/irc/connection.js
+++ b/server/irc/connection.js
@@ -756,7 +756,6 @@ function parseIrcLine(buffer_line) {
 
     if (!msg) {
         // The line was not parsed correctly, must be malformed
-        //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 083bda995da2f3825436d7fbb10e8ca9bca49998..375f63dae9009b24e8176c243a247b38e82527b7 100755 (executable)
--- a/server/irc/state.js
+++ b/server/irc/state.js
@@ -10,10 +10,10 @@ var State = function (client, save_state) {
     events.EventEmitter.call(this);
     this.client = client;
     this.save_state = save_state || false;
-    
+
     this.irc_connections = [];
     this.next_connection = 0;
-    
+
     this.client.on('dispose', function () {
         if (!that.save_state) {
             _.each(that.irc_connections, function (irc_connection, i, cons) {
@@ -23,7 +23,7 @@ var State = function (client, save_state) {
                     cons[i] = null;
                 }
             });
-            
+
             that.dispose();
         }
     });
@@ -66,8 +66,7 @@ State.prototype.connect = function (hostname, port, ssl, nick, user, options, ca
     });
 
     con.on('error', function IrcConnectionError(err) {
-        //console.log('irc_connection error (' + hostname + '):', err);
-        winston.warn('irc_connection error (%s): %s', hostname, err);
+        winston.warn('irc_connection error (%s):', hostname, err);
         return callback(err.message);
     });
 

diff --git a/server/kiwi.js b/server/kiwi.js
index 8e0f29d740efb08b7f6ff02c9cb9fc3d0b80b125..68dcf62a6317479bc3d8e332fb61a15154e7d2f9 100755 (executable)
--- a/server/kiwi.js
+++ b/server/kiwi.js
@@ -36,7 +36,31 @@ if (process.argv.indexOf('-f') === -1 && global.config && global.config.log) {
             log_file_name = __dirname + '/../' + log_file_name;
         }
 
-        winston.add(winston.transports.File, { filename: log_file_name, json: false});
+        winston.add(winston.transports.File, {
+            filename: log_file_name,
+            json: false,
+            timestamp: function() {
+                var year, month, day, time_string,
+                    d = new Date();
+
+                year = String(d.getFullYear());
+                month = String(d.getMonth() + 1);
+                if (month.length === 1) {
+                    month = "0" + month;
+                }
+
+                day = String(d.getDate());
+                if (day.length === 1) {
+                    day = "0" + day;
+                }
+
+                // Take the time from the existing toTimeString() format
+                time_string = (new Date()).toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1");
+
+                return year + "-" + month + "-" + day + ' ' + time_string;
+            }
+        });
+
         winston.remove(winston.transports.Console);
     })();
 }
@@ -45,13 +69,11 @@ 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?)');
     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');
     winston.error('No servers defined in config file');
     process.exit(2);
 }
@@ -69,10 +91,8 @@ 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');
             winston.info('Module %s loaded successfully', module_name);
         } else {
-            //console.log('Module ' + module_name + ' failed to load');
             winston.warn('Module %s failed to load', module_name);
         }
     });
@@ -238,7 +258,6 @@ _.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'));
             winston.info('Kiwi proxy listening on %s:%s %s SSL', server.address, server.port, (server.ssl ? 'with' : 'without'));
         });
 
@@ -269,13 +288,11 @@ _.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'));
             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);
             winston.info('Error listening on %s:%s: %s', server.address, server.port, err.code);
             // TODO: This should probably be refactored. ^JA
             webListenerRunning();
@@ -315,26 +332,20 @@ 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);
     winston.error('[Uncaught exception] %s', e, {stack: e.stack});
 });
 
 
 process.on('SIGUSR1', function() {
     if (config.loadConfig()) {
-        //console.log('New config file loaded');
         winston.info('New config file loaded');
     } else {
-        //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());
     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 0525d9c3d64576efb08ea692b665531af6baf11c..7727ca4c770c9c12a326579e53e954dc083931de 100644 (file)
--- a/server/weblistener.js
+++ b/server/weblistener.js
@@ -135,7 +135,6 @@ 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);
             winston.info('Unlisted proxy: %s', address);
             callback(null, false);
             return;

diff --git a/server_modules/control.js b/server_modules/control.js
index c9f8f7a942d02e84f6707df286404735e3ff5a4d..c1e551779ff26a8a8ed948836f2be0684be52e2f 100644 (file)
--- a/server_modules/control.js
+++ b/server_modules/control.js
@@ -23,7 +23,6 @@ function SocketClient (socket) {
     this.socket_closing = false;\r
 \r
     this.remoteAddress = this.socket.remoteAddress;\r
-    //console.log('Control connection from ' + this.socket.remoteAddress + ' opened');\r
     winston.info('Control connection from %s opened', this.socket.remoteAddress);\r
 \r
     this.bindEvents();\r
@@ -55,7 +54,6 @@ SocketClient.prototype.onClose = function() {
     this.unbindEvents();\r
     this.socket = null;\r
 \r
-    //console.log('Control connection from ' + this.remoteAddress + ' closed');\r
     winston.info('Control connection from %s closed', this.remoteAddress);\r
 };\r
 \r