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

wip

Browse source
This commit is contained in:
Michiel Borkent 2020-10-13 19:39:44 +02:00
parent fec742194c
commit 252be31a74
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,7 +228,7 @@
(recur)))))) (recur))))))
(defn read-port [pid] (defn read-port [pid]
(loop [] 1888 #_(loop []
(let [f (io/file (str ".babashka/pods/" pid ".port"))] (let [f (io/file (str ".babashka/pods/" pid ".port"))]
(if (.exists f) (if (.exists f)
(edn/read-string (slurp f)) (edn/read-string (slurp f))
@ -236,20 +236,23 @@
(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 :inherit-io]}]
(let [pod-spec (if (string? pod-spec) [pod-spec] pod-spec) (let [pod-spec (if (string? pod-spec) [pod-spec] pod-spec)
pb (ProcessBuilder. ^java.util.List pod-spec) pb (ProcessBuilder. ^java.util.List pod-spec)
_ (if socket _ (if inherit-io
(.inheritIO pb) (.inheritIO pb)
(.redirectError pb java.lang.ProcessBuilder$Redirect/INHERIT)) (.redirectError pb java.lang.ProcessBuilder$Redirect/INHERIT))
_ (doto (.environment pb) _ (doto (.environment pb)
(.put "BABASHKA_POD" "true")) (.put "BABASHKA_POD" "true"))
p (.start pb) p (.start pb)
pid (.pid p) pid (.pid p)
port (when socket (read-port pid)) socket-port (when socket (read-port pid))
stdin (.getOutputStream p) [stdin stdout _gobbler]
stdout (.getInputStream p) (if socket
stdout (java.io.PushbackInputStream. stdout) (let [socket (create-socket "localhost" socket-port)]
[(.getOutputStream socket)
(PushbackInputStream. (.getInputStream socket))])
[(.getOutputStream p) (java.io.PushbackInputStream. (.getInputStream p))])
_ (write stdin {"op" "describe" _ (write stdin {"op" "describe"
"id" (next-id)}) "id" (next-id)})
reply (read stdout) reply (read stdout)
@ -257,14 +260,6 @@
ops (some->> (get reply "ops") keys (map keyword) set) ops (some->> (get reply "ops") keys (map keyword) set)
readers (when (identical? :edn format) readers (when (identical? :edn format)
(read-readers reply resolve)) (read-readers reply resolve))
socket-port (get reply "port")
[stdin stdout _gobbler]
(if socket-port
(let [socket (create-socket "localhost" socket-port)]
[(.getOutputStream socket)
(PushbackInputStream. (.getInputStream socket))
(gobbler stdout)])
[stdin stdout])
pod {:process p pod {:process p
:pod-spec pod-spec :pod-spec pod-spec
:stdin stdin :stdin stdin