fix bug (#314)

Co-authored-by: Katie Dai <kdai7@ibm.com>
razee-io · Jan 31, 2023 · f781405 · f781405
1 parent cc64dde
commit f781405
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/Watchman.js b/lib/Watchman.js
@@ -55,6 +55,7 @@ module.exports = class Watchman {
     this._requestStream = undefined;
     this._jsonStream = undefined;
     this._errors = 0;
+    this._error = false;
     this._watching = false;
   }
 
@@ -78,6 +79,7 @@ module.exports = class Watchman {
 
   _watchError() {
     this._errors++;
+    this._error = true;
     this.end(this._rewatchOnTimeout);
     delay(this._errors * 1000).then(() => {
       if (this._rewatchOnTimeout)
@@ -102,7 +104,7 @@ module.exports = class Watchman {
           this._logger.debug('Watchman: watch started');
           this._watchStart = Date.now();
           this._watching = true;
-          this._errors = 0;
+          this._error = false;
         }
       })
       .on('error', (err) => {
@@ -113,6 +115,9 @@ module.exports = class Watchman {
       })
       .on('close', () => {
         this._watching = false;
+        if (!this._error) {
+          this._errors = 0;
+        }
         if (this._logger) {
           this._logger.info(`GET ${this._requestOptions.uri} closed. rewatchOnTimeout: ${this._rewatchOnTimeout}, errors: ${this._errors}`);
         }
@@ -124,18 +129,18 @@ module.exports = class Watchman {
     parser.on('data', (data) => {
       if (data.type === 'ERROR') {
         if (this._logger) {
-          this._logger.error(`GET ${this._requestOptions.uri} errored at data.type === ERROR`, JSON.stringify(data.object));
+          this._logger.error(`GET ${this._requestOptions.uri} errored at data.type === ERROR, aborting`, JSON.stringify(data.object));
         }
-        this._watchError();
+        this._requestStream.abort();
       } else {
         this.objectHandler(data);
       }
     });
     parser.on('error', (err) => {
       if (this._logger) {
-        this._logger.error(`GET ${this._requestOptions.uri} errored at parser.on error`, err);
+        this._logger.error(`GET ${this._requestOptions.uri} errored at parser.on error, aborting`, err);
       }
-      this._watchError();
+      this._requestStream.abort();
     });
     this._jsonStream = this._requestStream.pipe(parser);
   }