fix: exposes stuck services during shutdown timeout

Figedi · Aug 19, 2023 · b2d9402 · b2d9402
1 parent 1a85e3a
commit b2d9402
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/app/ApplicationBuilder.ts b/src/app/ApplicationBuilder.ts
@@ -607,17 +607,31 @@ export class ApplicationBuilder<Config> {
         );
 
         try {
+            const shutdownServices = new Set<ServiceWithLifecycleHandlers>(this.servicesWithLifecycleHandlers);
             await Promise.race([
                 sleep(this.appBuilderConfig.shutdownGracePeriodSeconds * 1000, true).then(() => {
                     const error = new Error("Timeout while graceful-shutdown, will exit now");
-                    this.rootLogger.error({ reason }, error.message);
+                    this.rootLogger.error(
+                        {
+                            remainingServicesWithLifecycleHandlers: Array.from(shutdownServices).map(
+                                s => s.constructor.name,
+                            ),
+                            reason,
+                        },
+                        error.message,
+                    );
                     if (this.appBuilderConfig.exitAfterRun) {
                         process.exit(1);
                     } else {
                         throw error;
                     }
                 }),
-                Promise.all(this.servicesWithLifecycleHandlers.map(svc => svc.shutdown && svc.shutdown())),
+                Promise.all(
+                    this.servicesWithLifecycleHandlers.map(async svc => {
+                        await svc.shutdown?.();
+                        shutdownServices.delete(svc);
+                    }),
+                ),
             ]);
             debug("Ran all service shutdown handlers");
             if (this.appBuilderConfig.exitAfterRun) {