Remove usage of soon-to-be legacy API in nrepl.
This commit is contained in:
parent
31253d4491
commit
0fa310859d
1 changed files with 7 additions and 4 deletions
|
@ -118,7 +118,7 @@
|
||||||
:bind ~(:host cfg) :port ~(:port cfg)
|
:bind ~(:host cfg) :port ~(:port cfg)
|
||||||
:ack-port ~ack-port
|
:ack-port ~ack-port
|
||||||
:handler ~(handler-for project))
|
:handler ~(handler-for project))
|
||||||
port# (-> server# deref :ss .getLocalPort)
|
port# (:port server#)
|
||||||
repl-port-file# (apply io/file ~(if (:root project)
|
repl-port-file# (apply io/file ~(if (:root project)
|
||||||
[(:root project) ".nrepl-port"]
|
[(:root project) ".nrepl-port"]
|
||||||
[(user/leiningen-home) "repl-port"]))
|
[(user/leiningen-home) "repl-port"]))
|
||||||
|
@ -162,15 +162,18 @@
|
||||||
`(do (try (require '~(init-ns project)) (catch Throwable t#))
|
`(do (try (require '~(init-ns project)) (catch Throwable t#))
|
||||||
(require ~@(init-requires project 'reply.main))))))
|
(require ~@(init-requires project 'reply.main))))))
|
||||||
|
|
||||||
(def lein-repl-server
|
(def ack-server
|
||||||
|
"The server which handles ack replies."
|
||||||
(delay (nrepl.server/start-server
|
(delay (nrepl.server/start-server
|
||||||
:bind (repl-host nil)
|
:bind (repl-host nil)
|
||||||
:handler (nrepl.ack/handle-ack nrepl.server/unknown-op))))
|
:handler (nrepl.ack/handle-ack nrepl.server/unknown-op))))
|
||||||
|
|
||||||
|
;; NB: This function cannot happen in parallel (or be recursive) because of race
|
||||||
|
;; conditions in nrepl.ack.
|
||||||
(defn server [project cfg headless?]
|
(defn server [project cfg headless?]
|
||||||
(nrepl.ack/reset-ack-port!)
|
(nrepl.ack/reset-ack-port!)
|
||||||
(let [prep-blocker @eval/prep-blocker
|
(let [prep-blocker @eval/prep-blocker
|
||||||
ack-port (-> @lein-repl-server deref :ss .getLocalPort)]
|
ack-port (:port @ack-server)]
|
||||||
(-> (bound-fn []
|
(-> (bound-fn []
|
||||||
(binding [eval/*pump-in* false]
|
(binding [eval/*pump-in* false]
|
||||||
(apply eval/eval-in-project project
|
(apply eval/eval-in-project project
|
||||||
|
@ -179,7 +182,7 @@
|
||||||
(when project @prep-blocker)
|
(when project @prep-blocker)
|
||||||
(when headless? @(promise))
|
(when headless? @(promise))
|
||||||
(if-let [repl-port (nrepl.ack/wait-for-ack
|
(if-let [repl-port (nrepl.ack/wait-for-ack
|
||||||
(-> project :repl-options (:timeout 60000)))]
|
(get-in project [:repl-options :timeout] 60000))]
|
||||||
(do (main/info "nREPL server started on port"
|
(do (main/info "nREPL server started on port"
|
||||||
repl-port "on host" (:host cfg))
|
repl-port "on host" (:host cfg))
|
||||||
repl-port)
|
repl-port)
|
||||||
|
|
Loading…
Reference in a new issue