Fix: requestTimeout bug (Request timed out after falsems) (#1253)

SOHU-Co · Apr 30, 2019 · ad8bed9 · ad8bed9
1 parent ca179f1
commit ad8bed9
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/lib/kafkaClient.js b/lib/kafkaClient.js
@@ -993,19 +993,25 @@ KafkaClient.prototype.waitUntilReady = function (broker, callback) {
 
   const onReady = () => {
     logger.debug('broker is now ready');
-    this._clearTimeout(timeoutId);
-    timeoutId = null;
+
+    if (timeoutId !== null) {
+      this._clearTimeout(timeoutId);
+      timeoutId = null;
+    }
+
     callback(null);
   };
 
   const timeout = this.options.requestTimeout;
   const readyEventName = broker.getReadyEventName();
 
-  timeoutId = this._createTimeout(() => {
-    this.removeListener(readyEventName, onReady);
-    this._timeouts.delete(timeoutId);
-    callback(new TimeoutError(`Request timed out after ${timeout}ms`));
-  }, timeout);
+  // if (typeof timeout === 'boolean' && timeout !== false) { 
+    timeoutId = this._createTimeout(() => {
+      this.removeListener(readyEventName, onReady);
+      this._timeouts.delete(timeoutId);
+      callback(new TimeoutError(`Request timed out after ${timeout}ms`));
+    }, timeout);
+  // }
 
   this.once(readyEventName, onReady);
 };