From a8268683e0b8eff3c3fc25fe86b3137f7591e461 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 15 Oct 2020 17:54:10 +0200 Subject: [PATCH] Fix NPE --- src/babashka/pods/impl.clj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/babashka/pods/impl.clj b/src/babashka/pods/impl.clj index 4afe063..5fdd2fa 100644 --- a/src/babashka/pods/impl.clj +++ b/src/babashka/pods/impl.clj @@ -255,6 +255,10 @@ (Integer. s) (recur))))) +(defn debug [& strs] + (binding [*out* *err*] + (println (str/join " " (map pr-str strs))))) + (defn load-pod ([pod-spec] (load-pod pod-spec nil)) ([pod-spec {:keys [:remove-ns :resolve :socket]}] @@ -263,9 +267,9 @@ _ (if socket (.inheritIO pb) (.redirectError pb java.lang.ProcessBuilder$Redirect/INHERIT)) - _ (doto (.environment pb) - (.put "BABASHKA_POD" "true") - (.put "BABASHKA_POD_SOCKET" (some-> socket str))) + _ (cond-> (doto (.environment pb) + (.put "BABASHKA_POD" "true")) + socket (.put "BABASHKA_POD_SOCKET" "true")) p (.start pb) port-file (when socket (port-file (.pid p))) socket-port (when socket (read-port port-file))