From c9da04feab232ed46b2029525ada7caf0189265b Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Sat, 3 Aug 2013 17:20:03 -0400
Subject: [PATCH] Made logging consistent

---
 client/garageserver.io.js | 42 +++++++++++++++++++--------------------
 lib/garageserver.io.js    |  3 +++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 3b23cb7..561e069 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -188,13 +188,13 @@ var GarageServerIO = (function (socketio) {
         registerSocketEvents = function () {
             _socket.on('connect', function () {
                 _stateController.id = _socket.socket.sessionid;
+                if (_options.logging) {
+                    console.log('garageserver.io:: socket connect');
+                }
 
                 if (_options.onPlayerConnect) {
                     _options.onPlayerConnect(); 
                 }
-                if (_options.logging) {
-                    console.log('garageserver.io:: socket connect');
-                }
             });
 
             _socket.on('state', function (data) {
@@ -224,21 +224,21 @@ var GarageServerIO = (function (socketio) {
             });
 
             _socket.on('disconnect', function () {
-                if (_options.onPlayerDisconnect) {
-                    _options.onPlayerDisconnect();
-                }
                 if (_options.logging) {
                     console.log('garageserver.io:: socket disconnect');
                 }
+                if (_options.onPlayerDisconnect) {
+                    _options.onPlayerDisconnect();
+                }
             });
 
             _socket.on('reconnect', function () {
-                if (_options.onPlayerReconnect) {
-                    _options.onPlayerReconnect();
-                }
                 if (_options.logging) {
                     console.log('garageserver.io:: socket reconnect');
                 }
+                if (_options.onPlayerReconnect) {
+                    _options.onPlayerReconnect();
+                }
             });
 
             _socket.on('update', function (data) {
@@ -247,41 +247,41 @@ var GarageServerIO = (function (socketio) {
 
             _socket.on('ping', function (data) {
                 _stateController.pingDelay = new Date().getTime() - data;
-                if (_options.onPing) {
-                    _options.onPing(_stateController.pingDelay);
-                }
                 if (_options.logging) {
                     console.log('garageserver.io:: socket ping delay ' + _stateController.pingDelay);
                 }
+                if (_options.onPing) {
+                    _options.onPing(_stateController.pingDelay);
+                }
             });
 
             _socket.on('removePlayer', function (id) {
                 removePlayer(id);
-                if (_options.onPlayerRemove) {
-                    _options.onPlayerRemove(id);
-                }
                 if (_options.logging) {
                     console.log('garageserver.io:: socket removePlayer ' + id);
                 }
+                if (_options.onPlayerRemove) {
+                    _options.onPlayerRemove(id);
+                }
             });
 
             _socket.on('removeEntity', function (id) {
                 removeEntity(id);
-                if (_options.onEntityRemove) {
-                    _options.onEntityRemove(id);
-                }
                 if (_options.logging) {
                     console.log('garageserver.io:: socket removeEntity ' + id);
                 }
+                if (_options.onEntityRemove) {
+                    _options.onEntityRemove(id);
+                }
             });
 
             _socket.on('event', function(data) {
-                if (_options.onEvent) {
-                    _options.onEvent(data);
-                }
                 if (_options.logging) {
                     console.log('garageserver.io:: socket event ' + data);
                 }
+                if (_options.onEvent) {
+                    _options.onEvent(data);
+                }
             });
         },
 
diff --git a/lib/garageserver.io.js b/lib/garageserver.io.js
index 32b8777..2d4e9be 100644
--- a/lib/garageserver.io.js
+++ b/lib/garageserver.io.js
@@ -83,6 +83,9 @@ GarageServer.prototype.registerSocketEvents = function (options) {
         });
 
         socket.on('event', function (data) {
+            if (options.logging) {
+                console.log('garageserver.io:: event ' + data);
+            }
             if (options.OnEvent) {
                 options.OnEvent(data);
             }