Correctly triggering IRC socket close events

diff --git a/server/irc/connection.js b/server/irc/connection.js
index 407e6e9253339385b10272300cf90f9716da68db..78e1430daed46cba47a50f4353bf7e91030de833 100644 (file)
--- a/server/irc/connection.js
+++ b/server/irc/connection.js
@@ -219,6 +219,8 @@ IrcConnection.prototype.end = function (data, callback) {
  * Clean up this IrcConnection instance and any sockets
  */
 IrcConnection.prototype.dispose = function () {
+    var that = this;
+
     _.each(this.irc_users, function (user) {
         user.dispose();
     });
@@ -233,8 +235,20 @@ IrcConnection.prototype.dispose = function () {
 
     EventBinder.unbindIrcEvents('', this.irc_events, this);
 
-    this.disposeSocket();
-    this.removeAllListeners();
+    // If we're still connected, wait until the socket is closed before disposing
+    // so that all the events are still correctly triggered
+    if (this.socket && this.connected) {
+        this.socket.once('close', function() {
+            that.disposeSocket();
+            that.removeAllListeners();
+        });
+
+        this.socket.end();
+
+    } else {
+        this.disposeSocket();
+        this.removeAllListeners();
+    }
 };