Merge branch 'master' into feature/local-manifests
This commit is contained in:
commit
951a6297d1
2 changed files with 10 additions and 6 deletions
|
|
@ -219,9 +219,12 @@
|
|||
;; listening to output synchronous.
|
||||
(when out
|
||||
(binding [*out* out-stream]
|
||||
(println out)))
|
||||
(when err (binding [*out* err-stream]
|
||||
(println err)))
|
||||
(print out)
|
||||
(.flush ^java.io.Writer out-stream)))
|
||||
(when err
|
||||
(binding [*out* err-stream]
|
||||
(print err)
|
||||
(.flush ^java.io.Writer err-stream)))
|
||||
(when (or value* error? namespace)
|
||||
(cond promise?
|
||||
(deliver chan (cond error? exception
|
||||
|
|
@ -292,7 +295,8 @@
|
|||
the socket is connected."
|
||||
^Socket
|
||||
[^String hostname ^Integer port]
|
||||
(Socket. hostname port))
|
||||
(doto (Socket. hostname port)
|
||||
(.setTcpNoDelay true)))
|
||||
|
||||
(defn close-socket
|
||||
"Close the socket, and also closes its input and output streams."
|
||||
|
|
|
|||
|
|
@ -207,14 +207,14 @@
|
|||
"id" id})
|
||||
pod.test-pod/print
|
||||
(do (write out
|
||||
{"out" (pr-str args)
|
||||
{"out" (with-out-str (prn args))
|
||||
"id" id})
|
||||
(write out
|
||||
{"status" ["done"]
|
||||
"id" id}))
|
||||
pod.test-pod/print-err
|
||||
(do (write out
|
||||
{"err" (pr-str args)
|
||||
{"err" (with-out-str (prn args))
|
||||
"id" id})
|
||||
(write out
|
||||
{"status" ["done"]
|
||||
|
|
|
|||
Loading…
Reference in a new issue