forcefulShutdown can be successful; channel errors separately

graphile · Nov 22, 2024 · 251f061 · 251f061
1 parent 71c0e88
commit 251f061
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 62 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -372,11 +372,11 @@ declare global {
 
       poolGracefulShutdown(
         event: GraphileWorker.PoolGracefulShutdownEvent,
-      ): Promise<void>;
+      ): ReturnType<WorkerPool["gracefulShutdown"]>;
 
       poolForcefulShutdown(
         event: GraphileWorker.PoolForcefulShutdownEvent,
-      ): Promise<void>;
+      ): ReturnType<WorkerPool["forcefulShutdown"]>;
     }
 
     interface WorkerHooks {

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -517,7 +517,9 @@ export interface WorkerPool {
   /** @deprecated Use gracefulShutdown instead */
   release: () => PromiseOrDirect<void>;
   gracefulShutdown: (message?: string) => PromiseOrDirect<void>;
-  forcefulShutdown: (message: string) => PromiseOrDirect<void>;
+  forcefulShutdown: (message: string) => PromiseOrDirect<{
+    forceFailedJobs: readonly Job[];
+  }>;
   promise: Promise<void>;
   /** Fires 'abort' when all running jobs should stop because worker is shutting down. @experimental */
   abortSignal: AbortSignal;