luciano/pods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix NPE

Browse source
This commit is contained in:
Michiel Borkent 2020-10-15 17:54:10 +02:00
parent b81d8b30bf
commit a8268683e0
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/babashka/pods/impl.clj
View file

@ -255,6 +255,10 @@
(Integer. s) (Integer. s)
(recur))))) (recur)))))
(defn debug [& strs]
(binding [*out* *err*]
(println (str/join " " (map pr-str strs)))))
(defn load-pod (defn load-pod
([pod-spec] (load-pod pod-spec nil)) ([pod-spec] (load-pod pod-spec nil))
([pod-spec {:keys [:remove-ns :resolve :socket]}] ([pod-spec {:keys [:remove-ns :resolve :socket]}]
@ -263,9 +267,9 @@
_ (if socket _ (if socket
(.inheritIO pb) (.inheritIO pb)
(.redirectError pb java.lang.ProcessBuilder$Redirect/INHERIT)) (.redirectError pb java.lang.ProcessBuilder$Redirect/INHERIT))
_ (doto (.environment pb) _ (cond-> (doto (.environment pb)
(.put "BABASHKA_POD" "true") (.put "BABASHKA_POD" "true"))
(.put "BABASHKA_POD_SOCKET" (some-> socket str))) socket (.put "BABASHKA_POD_SOCKET" "true"))
p (.start pb) p (.start pb)
port-file (when socket (port-file (.pid p))) port-file (when socket (port-file (.pid p)))
socket-port (when socket (read-port port-file)) socket-port (when socket (read-port port-file))