Skip to content

Commit e3ac6d2

Browse files
Merge pull request #120 from alexarchambault/tweak-logging
Tweak logging
2 parents 70c2cae + 7e1b2ea commit e3ac6d2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

frontend/src/main/scala/bloop/bsp/BspServer.scala

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ object BspServer {
9090
val server =
9191
new BloopLanguageServer(Observable.never, client, provider.services, ioScheduler, bspLogger)
9292

93-
def warn(msg: String): Unit = provider.stateAfterExecution.logger.warn(msg)
94-
def error(msg: String): Unit = provider.stateAfterExecution.logger.error(msg)
95-
9693
val inputExit = CancelablePromise[Unit]()
9794
val mesages =
9895
LowLevelMessage
@@ -130,8 +127,10 @@ object BspServer {
130127
case None => clients0
131128
}
132129
}
133-
if (cancelled) warn(s"BSP server cancelled, closing socket...")
134-
else error(s"BSP server stopped")
130+
bspLogger.info {
131+
if (cancelled) "BSP server cancelled, closing socket..."
132+
else "BSP server stopped"
133+
}
135134
server.cancelAllRequests()
136135
ioScheduler.scheduleOnce(
137136
100,
@@ -150,7 +149,11 @@ object BspServer {
150149

151150
process
152151
.doOnCancel(Task(stopListeting(cancelled = true)))
153-
.doOnFinish(_ => Task(stopListeting(cancelled = false)))
152+
.doOnFinish { errOpt =>
153+
for (err <- errOpt)
154+
err.printStackTrace(System.err)
155+
Task(stopListeting(cancelled = false))
156+
}
154157
.map(_ => provider.stateAfterExecution)
155158
}
156159

0 commit comments

Comments
 (0)