From b81d8b30bf1651e7235deb5c8ad79121c5a263d6 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 15 Oct 2020 17:19:44 +0200 Subject: [PATCH] Fix destroy --- script/test | 1 - src/babashka/pods/impl.clj | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/script/test b/script/test index aec1da0..4cb6a1b 100755 --- a/script/test +++ b/script/test @@ -27,4 +27,3 @@ BABASHKA_POD_TEST_SOCKET=true echo "Testing socket" clojure -A:test -n babashka.pods.jvm-test clojure -A:sci:test -n babashka.pods.sci-test - diff --git a/src/babashka/pods/impl.clj b/src/babashka/pods/impl.clj index 3391281..4afe063 100644 --- a/src/babashka/pods/impl.clj +++ b/src/babashka/pods/impl.clj @@ -203,7 +203,9 @@ (.destroy ^Process (:process pod))) (when-let [rns (:remove-ns pod)] (doseq [[ns-name _] (:namespaces pod)] - (rns ns-name))))) + (rns ns-name)))) + (swap! pods dissoc pod-id) + nil) (def next-pod-id (let [counter (atom 0)] @@ -298,14 +300,14 @@ :err *err* :remove-ns remove-ns :readers readers} - _ (add-shutdown-hook! #(do - (when socket - (close-socket socket)) - (destroy pod))) pod-namespaces (get reply "namespaces") pod-id (or (when-let [ns (first pod-namespaces)] (get-string ns "name")) (next-id)) + _ (add-shutdown-hook! #(do + (when socket + (close-socket socket)) + (destroy pod-id))) pod (assoc pod :pod-id pod-id) pod-namespaces (mapv #(bencode->namespace pod %) pod-namespaces)