clean up all ssh connections and exit cleanly

epiccastle · May 18, 2020 · e5c8599 · e5c8599
1 parent 578d72b
commit e5c8599
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/clj/spire/core.clj b/src/clj/spire/core.clj
@@ -1,10 +1,10 @@
 (ns spire.core
-  (:require [spire.state]
+  (:require [spire.state :as state]
             [spire.config :as config]
             [spire.output.core :as output]
             [spire.utils :as utils]
             [spire.eval :as eval]
-            [spire.state :as state]
+            [spire.transport :as transport]
             [spire.output.default]
             [spire.output.events]
             [spire.output.quiet]
@@ -82,4 +82,5 @@
           :else
           (println (usage summary)))))
     (finally
+      (transport/disconnect-all!)
       (shutdown-agents))))
diff --git a/src/clj/spire/transport.clj b/src/clj/spire/transport.clj
@@ -37,6 +37,12 @@
   (when debug (prn 'disconnect connection))
   (.disconnect connection))
 
+(defn disconnect-all! []
+  (let [[connections _] (reset-vals! state/ssh-connections {})]
+    (doall
+     (for [[_ {:keys [connection]}] connections]
+       (disconnect connection)))))
+
 (defn open-connection [host-config]
   (when debug (prn 'open-connection host-config))
   (let [conn-key (ssh/host-config-to-connection-key host-config)