Fix timeout reconnect

Also make sure client.connect is always set properly
mysqljs · Oct 14, 2010 · 2b3258c · 2b3258c
1 parent 4ce2fa8
commit 2b3258c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/lib/mysql/client.js b/lib/mysql/client.js
@@ -57,6 +57,7 @@ Client.prototype.connect = function(cb) {
       })
       .on('end', function() {
         if (self.ending) {
+          self.connected = false;
           self.ending = false;
           return;
         }
@@ -65,6 +66,7 @@ Client.prototype.connect = function(cb) {
           return;
         }
 
+        self.connected = false;
         self._prequeue(connect);
       });
 
@@ -258,6 +260,7 @@ Client.prototype._handlePacket = function(packet) {
   }
 
   if (type == Parser.OK_PACKET) {
+    this.connected = true;
     if (delegate) {
       delegate(null, Client._packetToUserObject(packet));
     }

diff --git a/test/simple/test-client.js b/test/simple/test-client.js
@@ -135,12 +135,16 @@ test(function connect() {
     });
 
     onConnection.end();
+    assert.equal(client.connected, false);
   })();
 
   (function testExpectedEnd() {
+    client.connected = false;
     client.ending = true;
+
     onConnection.end();
     assert.equal(client.ending, false);
+    assert.equal(client.connected, false);
   })();
 });
 
@@ -492,14 +496,17 @@ test(function _handlePacket() {
 
     client._queue = [TASK];
     client._handlePacket(PACKET);
+    assert.equal(client.connected, true);
   })();
 
   (function testNoDelegateOk() {
     var PACKET = {type: Parser.OK_PACKET};
     client._queue = [{}];
+    client.connected = false;
 
     gently.expect(client, '_dequeue');
     client._handlePacket(PACKET);
+    assert.equal(client.connected, true);
   })();
 
   (function testNormalError() {

diff --git a/test/system/test-client-timeout.js b/test/system/test-client-timeout.js
@@ -2,8 +2,13 @@ require('../common');
 var Client = require('mysql').Client,
     client = new Client(TEST_CONFIG),
     gently = new Gently(),
+    timeoutHappened = false,
     timeout = setTimeout(function() {
-      throw new Error('MySql timeout did not happen');
+      if (!timeoutHappened) {
+        throw new Error('MySql timeout did not happen');
+      }
+
+      gently.verify();
     }, 5000);
 
 client.connect();
@@ -14,6 +19,9 @@ client.query('SET wait_timeout = 1');
 client.query('SET net_read_timeout = 1');
 
 client._connection.on('end', function() {
+  timeoutHappened = true;
+  assert.equal(client.connected, false);
+
   client.query('SELECT 1', gently.expect(function afterTimeoutSelect(err) {
     clearTimeout(timeout);
     assert.ifError(err);