From 46402658f7de00125152d59734adc5ec30b6cb99 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Fri, 6 Sep 2024 16:50:24 +0200 Subject: [PATCH] bugfix: Try to stop bloop if unable to run about This was raised on discord and it seems when we fail to parse the output of `about` everything will break. This is because there is a server running and we will not restart it and the output of about command will again we wrong when we reask. Now, we should try to exit it first in that case since msot likely the server is broken. --- bloop-rifle/src/main/scala/bloop/rifle/BloopServer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bloop-rifle/src/main/scala/bloop/rifle/BloopServer.scala b/bloop-rifle/src/main/scala/bloop/rifle/BloopServer.scala index 269c4f4ef..b11525385 100644 --- a/bloop-rifle/src/main/scala/bloop/rifle/BloopServer.scala +++ b/bloop-rifle/src/main/scala/bloop/rifle/BloopServer.scala @@ -100,7 +100,7 @@ object BloopServer { } val bloopVersionIsOk = bloopInfo.exists(_.bloopVersion == expectedBloopVersion) val bloopJvmIsOk = bloopInfo.exists(_.jvmVersion == expectedBloopJvmRelease) - val isOk = bloopVersionIsOk && bloopJvmIsOk + val isOk = bloopVersionIsOk && bloopJvmIsOk && bloopInfo.isRight if (!isOk) { logger.debug(s"Bloop daemon status: ${bloopInfo.fold(_.message, _.message)}")