Cleanup gracefulShutdown handover to forcefulShutdown

Author: benjie

src/main.ts

@@ -839,13 +839,15 @@ export function _runTaskList(
                 cancelledJobs,
               });
             }
+
             if (this._forcefulShuttingDown) {
               errors.push(
                 new Error(
                   "forcefulShutdown was initiated whilst gracefulShutdown was still executing.",
                 ),
               );
             }
+
             if (errors.length === 1) {
               throw errors[0];
             } else if (errors.length > 1) {
@@ -872,8 +874,13 @@ export function _runTaskList(
                 error: e,
               },
             );
-            // Note: we now rely on forcefulShutdown to handle terminate()
-            return this.forcefulShutdown(message);
+            // NOTE: we now rely on forcefulShutdown to handle terminate()
+            if (this._forcefulShuttingDown) {
+              // Skip the warning about double shutdown
+              return forcefulShutdownPromise;
+            } else {
+              return this.forcefulShutdown(message);
+            }
           }
           if (!terminated) {
             await terminate();