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

fix: prevent server boot when --no-server is used (#8444) 

* fix: prevent server boot when --no-server is used
* refactor: move serverAutoStart to sysprops
* refact: scalafmt
This commit is contained in:
aka James4u 2026-01-07 12:11:04 -08:00 committed by GitHub
parent 948f12cf54
commit a4ad73ddf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/scala/sbt/Main.scala
View File

@ -78,11 +78,13 @@ private[sbt] object xMain:
val isNew: String => Boolean = cmd => (cmd == "new") || (cmd == "init") val isNew: String => Boolean = cmd => (cmd == "new") || (cmd == "init")
lazy val isServer = !userCommands.exists(c => isBsp(c) || isClient(c)) lazy val isServer = !userCommands.exists(c => isBsp(c) || isClient(c))
// keep this lazy to prevent project directory created prematurely // keep this lazy to prevent project directory created prematurely
lazy val bootServerSocket = if (isServer) getSocketOrExit(configuration) match { // Only create boot server socket if server mode is enabled and server autostart is enabled
case (_, Some(e)) => boundary.break(e) lazy val bootServerSocket =
case (s, _) => s if (isServer && SysProp.serverAutoStart) getSocketOrExit(configuration) match {
} case (_, Some(e)) => boundary.break(e)
else None case (s, _) => s
}
else None
lazy val detachStdio = userCommands.exists(_ == BasicCommandStrings.DashDashDetachStdio) lazy val detachStdio = userCommands.exists(_ == BasicCommandStrings.DashDashDetachStdio)
def withStreams[A](f: => A): A = def withStreams[A](f: => A): A =
try { try {

1
main/src/main/scala/sbt/internal/SysProp.scala
View File

@ -100,6 +100,7 @@ object SysProp {
def legacyTestReport: Boolean = getOrFalse("sbt.testing.legacyreport") def legacyTestReport: Boolean = getOrFalse("sbt.testing.legacyreport")
def semanticdb: Boolean = getOrFalse("sbt.semanticdb") def semanticdb: Boolean = getOrFalse("sbt.semanticdb")
def forceServerStart: Boolean = getOrFalse("sbt.server.forcestart") def forceServerStart: Boolean = getOrFalse("sbt.server.forcestart")
def serverAutoStart: Boolean = getOrTrue("sbt.server.autostart")
def remoteCache: Option[URI] = sys.props def remoteCache: Option[URI] = sys.props
.get("sbt.remote_cache") .get("sbt.remote_cache")
.map(URI(_)) .map(URI(_))