Merge pull request #146 from tablelandnetwork/joe/local-fix-shutdown

(local) ensure shutdown cannot be run repeatedly
tablelandnetwork · May 30, 2024 · f9f56a3 · f9f56a3
2 parents 34f7e27 + 4aaa05d
commit f9f56a3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/local/package.json b/packages/local/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tableland/local",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Tooling to start a sandboxed Tableland network.",
   "repository": {
     "type": "git",

diff --git a/packages/local/src/main.ts b/packages/local/src/main.ts
@@ -34,6 +34,7 @@ class LocalTableland {
   readonly defaultRegistryPort: number = 8545;
 
   #_readyResolves: Array<(value: unknown) => any> = [];
+  stopping: boolean = false;
   config;
   initEmitter;
   ready: boolean = false;
@@ -349,12 +350,24 @@ class LocalTableland {
 
   async shutdown(): Promise<void> {
     try {
+      // need to ensure shutdown isn't run twice in parallel since SIGINT is
+      // sent repeatedly depending on where it originates
+      if (this.stopping) {
+        console.log("stopping...");
+        return;
+      }
+
+      this.stopping = true;
       await this.shutdownValidator();
       await this.shutdownRegistry();
 
       this.#_cleanup();
+      this.stopping = false;
+      this.ready = false;
     } catch (err: any) {
       this.#_cleanup();
+      this.stopping = false;
+      this.ready = false;
       throw new Error(
         `unexpected error during shutdown: ${err.message as string}`
       );