luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2.0.x] Tweak server startup message (#9430) 

**Problem/Solution**
sbt 2.x uses client-server by default.
This makes the message a bit more obvious when the build is using a client.
This commit is contained in:
eugene yokota 2026-07-11 13:28:07 -04:00 committed by GitHub
parent 80f768225e
commit 3c350df583
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
View File

@ -182,6 +182,11 @@ class NetworkClient(
def log(level: Level.Value, message: => String): Unit = console.appendLog(level, message) def log(level: Level.Value, message: => String): Unit = console.appendLog(level, message)
} }
private val interactive = arguments.commandArguments.isEmpty private val interactive = arguments.commandArguments.isEmpty
private val startupMessages: List[String] =
"entering thin client - BEEP WHIRR" ::
"starting sbt server in the background" ::
"use 'sbt shutdown' to shutdown the server" ::
" " :: Nil
private[sbt] def connectOrStartServerAndConnect( private[sbt] def connectOrStartServerAndConnect(
promptCompleteUsers: Boolean, promptCompleteUsers: Boolean,
@ -358,8 +363,9 @@ class NetworkClient(
var serverStderrFile: Option[File] = None var serverStderrFile: Option[File] = None
val process = socket match { val process = socket match {
case None if startServer => case None if startServer =>
if (log) console.appendLog(Level.Info, "server was not detected. starting an instance") if log then
startupMessages.foreach: msg =>
console.appendLog(Level.Info, msg)
val props = val props =
Seq( Seq(
term.getWidth, term.getWidth,
@ -960,10 +966,8 @@ class NetworkClient(
catch { case _: InterruptedException => } catch { case _: InterruptedException => }
if (exitClean.get) 0 else 1 if (exitClean.get) 0 else 1
} }
if (interactive) { if interactive then block()
console.appendLog(Level.Info, "terminate the server with `shutdown`") else if exit then 0
block()
} else if (exit) 0
else { else {
batchMode.set(true) batchMode.set(true)
val res = batchExecute(userCommands.toList) val res = batchExecute(userCommands.toList)

2
main-command/src/main/scala/sbt/internal/server/Server.scala
View File

@ -97,7 +97,7 @@ private[sbt] object Server {
case null => case null =>
case s => s.close() case s => s.close()
} }
log.info(s"sbt server started at ${connection.shortName}") log.debug(s"sbt server started at ${connection.shortName}")
writePortfile() writePortfile()
if (connection.bspEnabled) { if (connection.bspEnabled) {
log.debug("Writing bsp connection file") log.debug("Writing bsp connection file")

2
main/src/main/scala/sbt/internal/CommandExchange.scala
View File

@ -254,7 +254,7 @@ private[sbt] final class CommandExchange {
case Some(Success(())) => case Some(Success(())) =>
// remember to shutdown only when the server comes up // remember to shutdown only when the server comes up
server = Some(serverInstance) server = Some(serverInstance)
s.log.info("started sbt server") s.log.debug("started sbt server")
// register this server in the shared proc directory // register this server in the shared proc directory
try { try {
val procDir = SysProp.globalLocalCache / "proc" val procDir = SysProp.globalLocalCache / "proc"