Merge branch 'master' into feature/local-manifests

This commit is contained in:
Wes Morgan 2022-10-10 11:39:47 -06:00 committed by GitHub
commit 951a6297d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions

View file

@ -219,9 +219,12 @@
;; listening to output synchronous. ;; listening to output synchronous.
(when out (when out
(binding [*out* out-stream] (binding [*out* out-stream]
(println out))) (print out)
(when err (binding [*out* err-stream] (.flush ^java.io.Writer out-stream)))
(println err))) (when err
(binding [*out* err-stream]
(print err)
(.flush ^java.io.Writer err-stream)))
(when (or value* error? namespace) (when (or value* error? namespace)
(cond promise? (cond promise?
(deliver chan (cond error? exception (deliver chan (cond error? exception
@ -292,7 +295,8 @@
the socket is connected." the socket is connected."
^Socket ^Socket
[^String hostname ^Integer port] [^String hostname ^Integer port]
(Socket. hostname port)) (doto (Socket. hostname port)
(.setTcpNoDelay true)))
(defn close-socket (defn close-socket
"Close the socket, and also closes its input and output streams." "Close the socket, and also closes its input and output streams."

View file

@ -207,14 +207,14 @@
"id" id}) "id" id})
pod.test-pod/print pod.test-pod/print
(do (write out (do (write out
{"out" (pr-str args) {"out" (with-out-str (prn args))
"id" id}) "id" id})
(write out (write out
{"status" ["done"] {"status" ["done"]
"id" id})) "id" id}))
pod.test-pod/print-err pod.test-pod/print-err
(do (write out (do (write out
{"err" (pr-str args) {"err" (with-out-str (prn args))
"id" id}) "id" id})
(write out (write out
{"status" ["done"] {"status" ["done"]