Simplify _connectionErrorHandler

felixge · felixge · commit af0677d846de · 2011-12-28T11:21:08.000+01:00
diff --git a/lib/Client.js b/lib/Client.js
@@ -58,7 +58,7 @@ Client.prototype._connect = function() {
   var self = this;
 
   socket
-    .on('error', this._connectionErrorHandler())
+    .on('error', this._connectionErrorHandler.bind(this))
     .on('data', parser.write.bind(parser))
     .on('end', this._onEnd.bind(this))
     .connect(this.port, this.host);
@@ -238,7 +238,7 @@ Client.prototype._handlePacket = function(packet) {
       return;
     }
 
-    this._connectionErrorHandler()(Client._packetToUserObject(packet));
+    this._connectionErrorHandler(Client._packetToUserObject(packet));
     return;
   }
 
@@ -270,31 +270,29 @@ Client.prototype._handlePacket = function(packet) {
   this._dequeue();
 };
 
-Client.prototype._connectionErrorHandler = function() {
-  return function(err) {
-    this.destroy();
+Client.prototype._connectionErrorHandler = function(err) {
+  this.destroy();
 
-    var task = this._queue[0];
-    var delegate = (task)
-      ? task.delegate
-      : null;
+  var task = this._queue[0];
+  var delegate = (task)
+    ? task.delegate
+    : null;
 
-    if (delegate instanceof Query) {
-      delegate.emit('error', err);
-      return;
-    }
+  if (delegate instanceof Query) {
+    delegate.emit('error', err);
+    return;
+  }
 
-    if (!delegate) {
-      this.emit('error', err);
-    } else {
-      delegate(err);
-      this._queue.shift();
-    }
+  if (!delegate) {
+    this.emit('error', err);
+  } else {
+    delegate(err);
+    this._queue.shift();
+  }
 
-    if (this._queue.length) {
-      this._connect();
-    }
-  }.bind(this);
+  if (this._queue.length) {
+    this._connect();
+  }
 };
 
 Client.prototype._sendAuth = function(greeting) {
