Ensure existing timer is cleared before creating a new one

We have seen some unexpected network requests for logs in error cases, e.g. pod not ready, but have not been able to reliably reproduce them. Ensure we clear any existing timer before starting a new one to ensure we're not left with any remaining unaccounted for timers when navigating away from the logs tab. Also change existing use of `clearInterval` to `clearTimeout` for clarity. Both use the same pool of ids and so are interchangeable, but we should be consistent to avoid confusion.
zhonghuilin · Dec 2, 2021 · a51903f · a51903f
1 parent a1f2f4a
commit a51903f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/components/src/components/Log/Log.js b/packages/components/src/components/Log/Log.js
@@ -68,7 +68,7 @@ export class LogContainer extends Component {
 
   componentWillUnmount() {
     window.removeEventListener('scroll', this.handleLogScroll, true);
-    clearInterval(this.timer);
+    clearTimeout(this.timer);
     this.cancelled = true;
   }
 
@@ -370,6 +370,7 @@ export class LogContainer extends Component {
           logs: logs ? logs.split('\n') : undefined
         });
         if (continuePolling) {
+          clearTimeout(this.timer);
           this.timer = setTimeout(this.loadLog, pollingInterval);
         }
       }
@@ -385,6 +386,7 @@ export class LogContainer extends Component {
         ]
       });
       if (continuePolling) {
+        clearTimeout(this.timer);
         this.timer = setTimeout(this.loadLog, pollingInterval);
       }
     }