Fix bug in schemaReporter.ts where stop() called while sendOneReportA…

…ndScheduleNext() is suspended would still result in setTimeout() being called. (#5222)
apollographql · May 18, 2021 · a43c411 · a43c411
1 parent 9e1bf7d
commit a43c411
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/packages/apollo-server-core/src/plugin/schemaReporting/schemaReporter.ts b/packages/apollo-server-core/src/plugin/schemaReporting/schemaReporter.ts
@@ -117,11 +117,13 @@ export class SchemaReporter {
       const result = await this.reportServerInfo(sendNextWithExecutableSchema);
       switch (result.kind) {
         case 'next':
-          this.pollTimer = setTimeout(
-            () =>
-              this.sendOneReportAndScheduleNext(result.withExecutableSchema),
-            result.inSeconds * 1000,
-          );
+          if (!this.stopped()) {
+            this.pollTimer = setTimeout(
+              () =>
+                this.sendOneReportAndScheduleNext(result.withExecutableSchema),
+              result.inSeconds * 1000,
+            );
+          }
           return;
         case 'stop':
           return;
@@ -133,10 +135,12 @@ export class SchemaReporter {
       this.logger.error(
         `Error reporting server info to Apollo during schema reporting: ${error}`,
       );
-      this.pollTimer = setTimeout(
-        () => this.sendOneReportAndScheduleNext(false),
-        this.fallbackReportingDelayInMs,
-      );
+      if (!this.stopped()) {
+        this.pollTimer = setTimeout(
+          () => this.sendOneReportAndScheduleNext(false),
+          this.fallbackReportingDelayInMs,
+        );
+      }
     }
   }