make background job shutdown cleanly

ceramicnetwork · Jul 29, 2024 · f5eaffd · f5eaffd
1 parent 1fe6794
commit f5eaffd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/core/src/ceramic.ts b/packages/core/src/ceramic.ts
@@ -24,6 +24,7 @@ import {
   CeramicSigner,
   StreamStateLoader,
   StreamReaderWriter,
+  delayOrAbort,
 } from '@ceramicnetwork/common'
 import {
   DEFAULT_TRACE_SAMPLE_RATIO,
@@ -683,12 +684,8 @@ export class Ceramic implements StreamReaderWriter, StreamStateLoader {
     let attemptNum = 0
     let backoffMs = 100
     const maxBackoffMs = 1000 * 60 // Caps off at checking once per minute
-    const delay = async function (ms) {
-      return new Promise<void>((resolve) => setTimeout(() => resolve(), ms))
-    }
 
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
+    while (!this._shutdownSignal.isShuttingDown()) {
       try {
         await this.dispatcher.getFromIpfs(model.cid)
         if (attemptNum > 0) {
@@ -704,7 +701,7 @@ export class Ceramic implements StreamReaderWriter, StreamStateLoader {
           this._logger.err(`Error loading Model ${model} used to publish Node Metrics: ${err}`)
         }
 
-        await delay(backoffMs)
+        await this._shutdownSignal.abortable((signal) => delayOrAbort(backoffMs, signal))
         attemptNum++
         if (backoffMs <= maxBackoffMs) {
           backoffMs *= 2

diff --git a/packages/core/src/shutdown-signal.ts b/packages/core/src/shutdown-signal.ts
@@ -7,6 +7,7 @@ import { Observer, Subject } from 'rxjs'
  */
 export class ShutdownSignal {
   private subject: Subject<void> = new Subject()
+  private shuttingDown = false
 
   /**
    * Subscribers to the signal.
@@ -20,6 +21,11 @@ export class ShutdownSignal {
    */
   abort(): void {
     this.subject.complete()
+    this.shuttingDown = true
+  }
+
+  isShuttingDown(): boolean {
+    return this.shuttingDown
   }
 
   /**