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

[#2] socket support

Browse source
This commit is contained in:
Michiel Borkent 2020-10-14 16:44:43 +02:00
parent 225f9239d8
commit 8732bc810b
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,8 @@
(:require [bencode.core :as bencode] (:require [bencode.core :as bencode]
[cheshire.core :as cheshire] [cheshire.core :as cheshire]
[clojure.edn :as edn] [clojure.edn :as edn]
[clojure.java.io :as io]) [clojure.java.io :as io]
[clojure.string :as str])
(:import [java.io PushbackInputStream] (:import [java.io PushbackInputStream]
[java.net Socket])) [java.net Socket]))
@ -219,26 +220,32 @@
[^Socket socket] [^Socket socket]
(.close socket)) (.close socket))
(defn read-port [pid] (defn port-file [pid]
1888 #_(loop [] (io/file (str ".babashka-pod-" pid ".port")))
(let [f (io/file (str ".babashka/pods/" pid ".port"))]
(if (.exists f) (defn read-port [^java.io.File port-file]
(edn/read-string (slurp f)) (time (loop []
(recur))))) (let [f port-file]
(if-let [s (when (.exists f)
(let [s (slurp f)]
(when (str/ends-with? s "\n")
(str/trim s))))]
(Integer. s)
(recur))))))
(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 :inherit-io]}] ([pod-spec {:keys [:remove-ns :resolve :socket]}]
(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 inherit-io _ (if socket
(.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) port-file (when socket (port-file (.pid p)))
socket-port (when socket (read-port pid)) socket-port (when socket (read-port port-file))
[stdin stdout] [stdin stdout]
(if socket (if socket
(let [^Socket socket (let [^Socket socket