Fix client socket when closing and error handling

carlessistare · carlessistare · commit f14c15d37e55 · 2016-01-18T18:07:07.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 *.swo
 test/data.txt
 docs
+.idea
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Follow the [instructions](http://kafka.apache.org/documentation.html#quickstart)
 * `connectionString`: Zookeeper connection string, default `localhost:2181/`
 * `clientId`: This is a user-supplied identifier for the client application, default `kafka-node-client`
 * `zkOptions`: **Object**, Zookeeper options, see [node-zookeeper-client](https://github.com/alexguan/node-zookeeper-client#client-createclientconnectionstring-options)
-* `noAckBatchOptions`: **Object**, when requireAcks is disabled on Producer side we can define the batch properties, 'noAckBatchSize' in bytes and 'noAckBatchAge' in milliseconds. The default value is `{ noAckBatchSize: 500, noAckBatchAge: 300 }`
+* `noAckBatchOptions`: **Object**, when requireAcks is disabled on Producer side we can define the batch properties, 'noAckBatchSize' in bytes and 'noAckBatchAge' in milliseconds. The default value is `{ noAckBatchSize: null, noAckBatchAge: null }` and it acts as if there was no batch
 
 ### close(cb)
 Closes the connection to Zookeeper and the brokers so that the node process can exit gracefully.
diff --git a/lib/client.js b/lib/client.js
@@ -413,13 +413,13 @@ Client.prototype.sendToBroker = function (payloads, encoder, decoder, cb) {
         var correlationId = this.nextId();
         var request = encoder.call(null, this.clientId, correlationId, payloads[leader]);
         var broker = this.brokerForLeader(leader, longpolling);
-        if (broker.error || broker.closing) {
+        if (broker.socket.error || broker.socket.closing) {
             return cb(new errors.BrokerNotAvailableError('Could not find the leader'), payloads[leader]);
         }
 
         if (longpolling) {
-            if (broker.waitting) continue;
-            broker.waitting = true;
+            if (broker.socket.waitting) continue;
+            broker.socket.waitting = true;
         }
 
         if (decoder.requireAcks == 0) {
@@ -579,29 +579,29 @@ Client.prototype.handleReceivedData = function (socket) {
         setImmediate(function () { this.handleReceivedData(socket);}.bind(this));
 };
 
-Client.prototype.queueCallback = function (broker, id, data) {
-    var brokerId = broker.socketId;
+Client.prototype.queueCallback = function (socket, id, data) {
+    var socketId = socket.socketId;
     var queue;
 
-    if (this.cbqueue.hasOwnProperty(brokerId)) {
-        queue = this.cbqueue[brokerId];
+    if (this.cbqueue.hasOwnProperty(socketId)) {
+        queue = this.cbqueue[socketId];
     }
     else {
         queue = {};
-        this.cbqueue[brokerId] = queue;
+        this.cbqueue[socketId] = queue;
     }
 
     queue[id] = data;
 };
 
-Client.prototype.unqueueCallback = function (broker, id) {
-    var brokerId = broker.socketId;
+Client.prototype.unqueueCallback = function (socket, id) {
+    var socketId = socket.socketId;
 
-    if (!this.cbqueue.hasOwnProperty(brokerId)) {
+    if (!this.cbqueue.hasOwnProperty(socketId)) {
         return null;
     }
 
-    var queue = this.cbqueue[brokerId];
+    var queue = this.cbqueue[socketId];
     if (!queue.hasOwnProperty(id)) {
         return null;
     }
@@ -611,21 +611,21 @@ Client.prototype.unqueueCallback = function (broker, id) {
     // cleanup socket queue
     delete queue[id];
     if (!Object.keys(queue).length) {
-        delete this.cbqueue[brokerId];
+        delete this.cbqueue[socketId];
     }
 
     return result;
 };
 
-Client.prototype.clearCallbackQueue = function (broker, error) {
-    var brokerId = broker.socketId;
-    var longpolling = broker.longpolling;
+Client.prototype.clearCallbackQueue = function (socket, error) {
+    var socketId = socket.socketId;
+    var longpolling = socket.longpolling;
 
-    if (!this.cbqueue.hasOwnProperty(brokerId)) {
+    if (!this.cbqueue.hasOwnProperty(socketId)) {
         return;
     }
 
-    var queue = this.cbqueue[brokerId];
+    var queue = this.cbqueue[socketId];
 
     if (!longpolling) {
         Object.keys(queue).forEach(function (key) {
@@ -634,7 +634,7 @@ Client.prototype.clearCallbackQueue = function (broker, error) {
             cb(error);
         });
     }
-    delete this.cbqueue[brokerId];
+    delete this.cbqueue[socketId];
 };
 
 module.exports = Client;

-Original file line number
+Diff line change
 *.swo
 test/data.txt
 docs
 +.idea