From: Jack Allnutt <m2ys4u@Gmail.com>
Date: Sat, 21 Jan 2012 17:38:14 +0000 (+0000)
Subject: Removing git blunders
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=af97974270467e26c4c5407dd45e3d92b4660adf;p=KiwiIRC.git

Removing git blunders
---

diff --git a/README.md b/README.md
index 9026079..ec69ca0 100755
--- a/README.md
+++ b/README.md
@@ -1,22 +1,24 @@
 # Installation
-* Get the Kiwi source and dependencies
 
-    $git clone https://github.com/prawnsalad/KiwiIRC.git
-    $npm install
+* Install the dependencies
+
+    $npm install jade
+
+    $npm install node-static
+
+    $npm install uglify-js
+
+    $npm install socket.io
+
+    $npm install socket.io-client
     
-* Create your SSL certificate and key, place it in the server folder.
+* If you're using SSL, create your certificate and key, place it in the server folder.
 
 * Edit the configuration file
 
     $nano server/config.json
     
 # Running 
-Either use npm
-
-    $npm start
-
-or run node directly
-
     $node server/kiwi.js
 
 # Bugs
diff --git a/client/js/front.events.js b/client/js/front.events.js
index 05bca87..a4b6712 100644
--- a/client/js/front.events.js
+++ b/client/js/front.events.js
@@ -595,7 +595,7 @@ kiwi.front.events = {
             break;
         default:
             // We don't know what data contains, so don't do anything with it.
-            //kiwi.front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status');
+            console.log(e, data);
         }
     },
 
diff --git a/client/js/gateway.js b/client/js/gateway.js
index 37fec1a..e7a9a51 100644
--- a/client/js/gateway.js
+++ b/client/js/gateway.js
@@ -119,6 +119,7 @@ kiwi.gateway = {
             kiwi.gateway.socket.on('reconnect_failed', function () {
                 console.log("kiwi.gateway.socket.on('reconnect_failed')");
             });
+            kiwi.gateway.socket.on('error', console.log);
         }
     },
 
diff --git a/package.json b/package.json
deleted file mode 100644
index 2ee89f2..0000000
--- a/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "scripts": {
-        "start": "node server/kiwi.js"
-    },
-    "name": "KiwiIRC",
-    "version": "0.1.0-dev",
-    "homepage": "http://kiwiirc.com",
-    "repository" : {
-        "type" : "git",
-        "url" : "https://github.com/prawnsalad/KiwiIRC.git"
-    },
-    "dependencies": {
-        "jade": ">=0.16.2",
-        "node-static": ">=0.5.9",
-        "uglify-js": ">=1.1.1",
-        "socket.io": ">=0.8.5",
-        "socket.io-client": ">=0.8.5"
-    },
-    "private": true
-}
diff --git a/server/app.js b/server/app.js
index 36d2213..e9278e8 100644
--- a/server/app.js
+++ b/server/app.js
@@ -793,6 +793,7 @@ this.websocketListen = function (servers, handler) {
             }
             callback(null, true);
         }).on('connection', kiwi.websocketConnection);
+        io.of('/kiwi').on('error', console.log);
     });
 };
 
@@ -840,6 +841,7 @@ this.websocketConnection = function (websocket) {
         });
         websocket.on('message', kiwi.websocketMessage);
         websocket.on('disconnect', kiwi.websocketDisconnect);
+        websocket.on('error', console.log);
     }
 };
 
@@ -990,6 +992,9 @@ this.IRCConnection = function (websocket, nick, host, port, ssl, password, callb
         });
         bound_events = kiwi.bindIRCCommands(that, websocket);
     };
+    
+    that.on('error', console.log);
+    
 };