Compare commits
2 commits
master
...
socket-pod
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
252be31a74 | ||
|
|
fec742194c |
1 changed files with 19 additions and 13 deletions
|
|
@ -227,18 +227,32 @@
|
|||
(print (char v))
|
||||
(recur))))))
|
||||
|
||||
(defn read-port [pid]
|
||||
1888 #_(loop []
|
||||
(let [f (io/file (str ".babashka/pods/" pid ".port"))]
|
||||
(if (.exists f)
|
||||
(edn/read-string (slurp f))
|
||||
(recur)))))
|
||||
|
||||
(defn load-pod
|
||||
([pod-spec] (load-pod pod-spec nil))
|
||||
([pod-spec {:keys [:remove-ns :resolve]}]
|
||||
([pod-spec {:keys [:remove-ns :resolve :socket :inherit-io]}]
|
||||
(let [pod-spec (if (string? pod-spec) [pod-spec] pod-spec)
|
||||
pb (ProcessBuilder. ^java.util.List pod-spec)
|
||||
_ (.redirectError pb java.lang.ProcessBuilder$Redirect/INHERIT)
|
||||
_ (if inherit-io
|
||||
(.inheritIO pb)
|
||||
(.redirectError pb java.lang.ProcessBuilder$Redirect/INHERIT))
|
||||
_ (doto (.environment pb)
|
||||
(.put "BABASHKA_POD" "true"))
|
||||
p (.start pb)
|
||||
stdin (.getOutputStream p)
|
||||
stdout (.getInputStream p)
|
||||
stdout (java.io.PushbackInputStream. stdout)
|
||||
pid (.pid p)
|
||||
socket-port (when socket (read-port pid))
|
||||
[stdin stdout _gobbler]
|
||||
(if socket
|
||||
(let [socket (create-socket "localhost" socket-port)]
|
||||
[(.getOutputStream socket)
|
||||
(PushbackInputStream. (.getInputStream socket))])
|
||||
[(.getOutputStream p) (java.io.PushbackInputStream. (.getInputStream p))])
|
||||
_ (write stdin {"op" "describe"
|
||||
"id" (next-id)})
|
||||
reply (read stdout)
|
||||
|
|
@ -246,14 +260,6 @@
|
|||
ops (some->> (get reply "ops") keys (map keyword) set)
|
||||
readers (when (identical? :edn format)
|
||||
(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-spec pod-spec
|
||||
:stdin stdin
|
||||
|
|
|
|||
Loading…
Reference in a new issue