Rename _connectionErrorHandler -> _onError

felixge · felixge · commit 7459d1c79374 · 2011-12-28T11:21:39.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.bind(this))
+    .on('error', this._onError.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._onError(Client._packetToUserObject(packet));
     return;
   }
 
@@ -270,31 +270,6 @@ Client.prototype._handlePacket = function(packet) {
   this._dequeue();
 };
 
-Client.prototype._connectionErrorHandler = function(err) {
-  this.destroy();
-
-  var task = this._queue[0];
-  var delegate = (task)
-    ? task.delegate
-    : null;
-
-  if (delegate instanceof Query) {
-    delegate.emit('error', err);
-    return;
-  }
-
-  if (!delegate) {
-    this.emit('error', err);
-  } else {
-    delegate(err);
-    this._queue.shift();
-  }
-
-  if (this._queue.length) {
-    this._connect();
-  }
-};
-
 Client.prototype._sendAuth = function(greeting) {
   var token = auth.token(this.password, greeting.scrambleBuffer);
   var packetSize = (
@@ -360,6 +335,31 @@ Client.prototype._sendOldAuth = function(greeting) {
   this.write(packet);
 };
 
+Client.prototype._onError = function(err) {
+  this.destroy();
+
+  var task = this._queue[0];
+  var delegate = (task)
+    ? task.delegate
+    : null;
+
+  if (delegate instanceof Query) {
+    delegate.emit('error', err);
+    return;
+  }
+
+  if (!delegate) {
+    this.emit('error', err);
+  } else {
+    delegate(err);
+    this._queue.shift();
+  }
+
+  if (this._queue.length) {
+    this._connect();
+  }
+};
+
 Client.prototype._onEnd = function() {
   if (this.ending) {
     // @todo destroy()?
