Logging output refactoring

diff --git a/server/app.js b/server/app.js
index a6c993a36b2933861cccd0aed03f31a17e864c90..432806a36225979a982351965de39b7cadca0e3c 100644 (file)
--- a/server/app.js
+++ b/server/app.js
@@ -50,7 +50,7 @@ this.changeUser = function () {
         try {
             process.setgid(kiwi.config.group);
         } catch (err) {
-            console.log('Failed to set gid: ' + err);
+            kiwi.log('Failed to set gid: ' + err);
             process.exit();
         }
     }
@@ -59,7 +59,7 @@ this.changeUser = function () {
         try {
             process.setuid(kiwi.config.user);
         } catch (e) {
-            console.log('Failed to set uid: ' + e);
+            kiwi.log('Failed to set uid: ' + e);
             process.exit();
         }
     }
@@ -272,7 +272,7 @@ this.parseIRCMessage = function (websocket, ircSocket, data) {
             if (i > 0) {
                 websocket.sendClientEvent('userlist', {server: '', "users": nicklist, channel: chan});
             } else {
-                console.log("oops");
+                kiwi.log("oops");
             }
             break;
         case ircNumerics.RPL_ENDOFNAMES:
@@ -287,7 +287,7 @@ this.parseIRCMessage = function (websocket, ircSocket, data) {
             break;
         case ircNumerics.RPL_BANLIST:
             params = msg.params.split(" ");
-            console.log(params);
+            kiwi.log(params);
             websocket.sendClientEvent('banlist', {server: '', channel: params[1], banned: params[2], banned_by: params[3], banned_at: params[4]});
             break;
         case ircNumerics.RPL_ENDOFBANLIST:
@@ -436,9 +436,9 @@ this.parseIRCMessage = function (websocket, ircSocket, data) {
                         ircSocket.addListener('data', listener);
                     });
                 });
-                //console.log(ircSocket);
+                //log(ircSocket);
             } catch (e) {
-                console.log(e);
+                kiwi.log(e);
             }
             break;*/
         case ircNumerics.ERR_CANNOTSENDTOCHAN:
@@ -479,14 +479,14 @@ this.parseIRCMessage = function (websocket, ircSocket, data) {
             break;
         case ircNumerics.ERR_NOTREGISTERED:
             if (ircSocket.IRC.registered) {
-                console.log('Kiwi thinks user is registered, but the IRC server thinks differently');
+                kiwi.log('Kiwi thinks user is registered, but the IRC server thinks differently');
             }
             break;
         default:
-            console.log("Unknown command (" + String(msg.command).toUpperCase() + ")");
+            kiwi.log("Unknown command (" + String(msg.command).toUpperCase() + ")");
         }
     } else {
-        console.log("Malformed IRC line: " + data);
+        kiwi.log("Malformed IRC line: " + data);
     }
 };
 
@@ -559,7 +559,7 @@ this.httpHandler = function (request, response) {
                     nick = _.detect(modifiers, function (mod) {
                         return mod === ',isnick';
                     });
-                    console.log(request.headers);
+                    kiwi.log(request.headers);
                     response.statusCode = 303;
                     response.setHeader('Location', 'http' + ((secure) ? 's' : '') + '://' + request.headers.host + '/client/' + ircuri.host + '/' + ((!nick) ? target : ''));
                     response.end();
@@ -691,10 +691,10 @@ this.httpHandler = function (request, response) {
                                 }
                             } catch (e) {
                                 response.statusCode = 500;
-                                console.log(e);
+                                kiwi.log(e);
                             }
                         } else {
-                            console.log(err);
+                            kiwi.log(err);
                             response.statusCode = 500;
                         }
                         response.end();
@@ -709,8 +709,8 @@ this.httpHandler = function (request, response) {
         }
 
     } catch (e) {
-        console.log('ERROR app.httpHandler()');
-        console.log(e);
+        kiwi.log('ERROR app.httpHandler()');
+        kiwi.log(e);
     }
 };
 
@@ -742,13 +742,13 @@ this.websocketListen = function (servers, handler) {
             hs = https.createServer(opts, handler);
             kiwi.io.push(ws.listen(hs, {secure: true}));
             hs.listen(server.port, server.address);
-            console.log("Listening on %s:%d with SSL", server.address, server.port);
+            kiwi.log("Listening on %s:%d with SSL", server.address, server.port);
         } else {
             // Start some plain-text server up
             hs = http.createServer(handler);
             kiwi.io.push(ws.listen(hs, {secure: false}));
             hs.listen(server.port, server.address);
-            console.log("Listening on %s:%d without SSL", server.address, server.port);
+            kiwi.log("Listening on %s:%d without SSL", server.address, server.port);
         }
 
         kiwi.httpServers.push(hs);
@@ -768,6 +768,7 @@ this.websocketListen = function (servers, handler) {
             callback(null, true);
         }).on('connection', kiwi.websocketConnection);
     });
+    nonExistantFunction();
 };
 
 
@@ -777,7 +778,7 @@ this.websocketListen = function (servers, handler) {
 
 this.websocketConnection = function (websocket) {
     var con;
-    console.log("New connection!");
+    kiwi.log("New connection!");
     websocket.kiwi = {address: websocket.handshake.address.address, buffer: {list: []}};
     con = kiwi.connections[websocket.kiwi.address];
 
@@ -844,7 +845,7 @@ this.websocketIRCConnect = function (websocket, nick, host, port, ssl, password,
     ircSocket.IRC.nick = nick;
     // Send the login data
     dns.reverse(websocket.kiwi.address, function (err, domains) {
-        //console.log(domains);
+        //log(domains);
         websocket.kiwi.hostname = (err) ? websocket.kiwi.address : _.first(domains);
         if ((kiwi.config.webirc) && (kiwi.config.webirc_pass[host])) {
             websocket.sendServerLine('WEBIRC ' + kiwi.config.webirc_pass[host] + ' KiwiIRC ' + websocket.kiwi.hostname + ' ' + websocket.kiwi.address);
@@ -962,7 +963,7 @@ this.websocketMessage = function (websocket, msg, callback) {
             callback();
         }
     } catch (e) {
-        console.log("Caught error: " + e);
+        kiwi.log("Caught error: " + e);
     }
 };
 
@@ -1004,7 +1005,7 @@ this.rehash = function () {
     changes = reload_config[1];
 
     if (Object.keys(changes).length !== 0) {
-        console.log('%s config changes: \n', Object.keys(changes).length, changes);
+        kiwi.log('%s config changes: \n', Object.keys(changes).length, changes);
         for (i in changes) {
             switch (i) {
             case 'ports':
@@ -1055,18 +1056,23 @@ this.manageControll = function (data) {
         i;
     switch (parts[0]) {
     case 'rehash':
-        console.log('Rehashing...');
-        console.log(kiwi.rehash() ? 'Rehash complete' : 'Rehash failed');
+        kiwi.log('Rehashing...');
+        kiwi.log(kiwi.rehash() ? 'Rehash complete' : 'Rehash failed');
         break;
 
     case 'recode':
-        console.log('Recoding...');
-        console.log(kiwi.recode() ? 'Recode complete' : 'Recode failed');
+        kiwi.log('Recoding...');
+        kiwi.log(kiwi.recode() ? 'Recode complete' : 'Recode failed');
         break;
 
     case 'mod':
         if (parts[1] === 'reload') {
-            console.log('Reloading module (' + parts[2] + ')..');
+            if (!parts[2]) {
+                kiwi.log('Usage: mod reload module_name');
+                return;
+            }
+
+            kiwi.log('Reloading module (' + parts[2] + ')..');
             kiwi.kiwi_mod.reloadModule(parts[2]);
         }
         break;
@@ -1075,7 +1081,7 @@ this.manageControll = function (data) {
         if (parts[1] === 'clear') {
             kiwi.cache.html = {};
             kiwi.cache.alljs = '';
-            console.log('HTML cache cleared');
+            kiwi.log('HTML cache cleared');
         }
         break;
 
@@ -1083,10 +1089,10 @@ this.manageControll = function (data) {
         for (i in kiwi.connections) {
             connections_cnt = connections_cnt + parseInt(kiwi.connections[i].count, 10);
         }
-        console.log(connections_cnt.toString() + ' connected clients');
+        kiwi.log(connections_cnt.toString() + ' connected clients');
         break;
 
     default:
-        console.log('Unknown command \'' + parts[0] + '\'');
+        kiwi.log('Unknown command \'' + parts[0] + '\'');
     }
 };

diff --git a/server/kiwi.js b/server/kiwi.js
index 5b14d0dddf2ccc05d63ef08f97461c626f37d4b8..22571b402b5e12a3f6d803424f05097c47dd229c 100644 (file)
--- a/server/kiwi.js
+++ b/server/kiwi.js
@@ -25,6 +25,13 @@ this.kiwi_root = __dirname;
 
 
 
+// How to handle log output
+this.log = function(str, level) {
+    level = level || 0;
+    console.log(str);
+}
+
+
 /*
  * Configuration and rehashing routines
  */
@@ -52,7 +59,7 @@ this.loadConfig = function () {
                     this.config[j] = nconf[j];
                 }
 
-                console.log('Loaded config file ' + config_dirs[i] + config_filename);
+                this.log('Loaded config file ' + config_dirs[i] + config_filename);
                 break;
             }
         } catch (e) {
@@ -60,7 +67,7 @@ this.loadConfig = function () {
             case 'ENOENT':      // No file/dir
                 break;
             default:
-                console.log('An error occured parsing the config file ' + config_dirs[i] + config_filename + ': ' + e.message);
+                this.log('An error occured parsing the config file ' + config_dirs[i] + config_filename + ': ' + e.message);
                 return false;
             }
             continue;
@@ -68,7 +75,7 @@ this.loadConfig = function () {
     }
     if (Object.keys(this.config).length === 0) {
         if (!found_config) {
-            console.log('Couldn\'t find a config file!');
+            this.log('Couldn\'t find a config file!');
         }
         return false;
     }
@@ -196,6 +203,10 @@ this.kiwi_mod.loadModules(this.kiwi_root, this.config);
 this.kiwi_mod.printMods();
 
 
+// Make sure Kiwi doesn't simply quit on an exception
+process.on('uncaughtException', function (e) {
+    this.log('[Uncaught exception] ' + e);
+});
 
 
 // Start the server up

diff --git a/server/lib/kiwi_mod.js b/server/lib/kiwi_mod.js
index 2e23c1b6db6494ff4d19037e97fa81a9aa6eeb6e..bdac9c37f23c08114ed06cc7a30a5ee8a1ffd273 100644 (file)
--- a/server/lib/kiwi_mod.js
+++ b/server/lib/kiwi_mod.js
@@ -55,10 +55,10 @@ exports.reloadModule = function (mod_name) {
             kiwi.kiwi_mod.loaded_modules[mod_name] = null;
             kiwi.kiwi_mod.loaded_modules[mod_name] = require(mod_path);
 
-            console.log('Module ' + mod_name + ' reloaded.');
+            kiwi.log('Module ' + mod_name + ' reloaded.');
         } catch (e) {
-            console.log('reloadModule error!');
-            console.log(e);
+            kiwi.log('reloadModule error!');
+            kiwi.log(e);
             return false;
         }
     });
@@ -95,8 +95,8 @@ exports.run = function (event_name, event_data, opts) {
 
 exports.printMods = function () {
     var mod_name;
-    console.log('Loaded Kiwi modules:');
+    kiwi.log('Loaded Kiwi modules:');
     for (mod_name in this.loaded_modules) {
-        console.log(' - ' + mod_name);
+        kiwi.log(' - ' + mod_name);
     }
 };