Skip to content

Commit 718b834

Browse files
committed
Clarify chan-server defaults
1 parent 52df404 commit 718b834

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/lsp4clj/server.clj

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,18 @@
287287
[{:keys [output-ch input-ch log-ch trace? trace-level trace-ch clock on-close]
288288
:or {clock (java.time.Clock/systemDefaultZone)
289289
on-close (constantly nil)}}]
290-
(let [trace-level (or trace-level
291-
(when (or trace? trace-ch) "verbose")
292-
"off")]
290+
(let [;; before defaulting trace-ch, so that default is "off"
291+
tracer (trace/tracer-for-level (or trace-level
292+
(when (or trace? trace-ch) "verbose")
293+
"off"))
294+
log-ch (or log-ch (async/chan (async/sliding-buffer 20)))
295+
trace-ch (or trace-ch (async/chan (async/sliding-buffer 20)))]
293296
(map->ChanServer
294297
{:output-ch output-ch
295298
:input-ch input-ch
296-
:log-ch (or log-ch (async/chan (async/sliding-buffer 20)))
297-
:trace-ch (or trace-ch (async/chan (async/sliding-buffer 20)))
298-
:tracer* (atom (trace/tracer-for-level trace-level))
299+
:log-ch log-ch
300+
:trace-ch trace-ch
301+
:tracer* (atom tracer)
299302
:clock clock
300303
:on-close on-close
301304
:request-id* (atom 0)

0 commit comments

Comments
 (0)