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

Merge pull request #9130 from eed3si9n/wip/ignore-ctrl-c 

[2.x] fix: Fixes ctrl-c handling
This commit is contained in:
eugene yokota 2026-04-25 18:03:50 -04:00 committed by GitHub
parent 8d6627929d bf678f2d6a
commit d132926197
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ class NetworkClient(
private val inLock = new Object private val inLock = new Object
private val inputThread = new AtomicReference[RawInputThread] private val inputThread = new AtomicReference[RawInputThread]
private val exitClean = new AtomicBoolean(true) private val exitClean = new AtomicBoolean(true)
private val inClientSideRun = new AtomicBoolean(false)
private val sbtProcess = new AtomicReference[Process](null) private val sbtProcess = new AtomicReference[Process](null)
private class ConnectionRefusedException(t: Throwable) extends Throwable(t) private class ConnectionRefusedException(t: Throwable) extends Throwable(t)
private class ServerFailedException extends Exception private class ServerFailedException extends Exception
@ -816,9 +817,12 @@ class NetworkClient(
} }
Run.processExitCode(exitCode, "runner") Run.processExitCode(exitCode, "runner")
} }
if (runInfo.jvm) inClientSideRun.set(true)
RunHandler.jvmRun(runInfo.jvmRunInfo.getOrElse(sys.error("missing jvmRunInfo")), log) try
else nativeRun(runInfo.nativeRunInfo.getOrElse(sys.error("missing nativeRunInfo"))) if (runInfo.jvm)
RunHandler.jvmRun(runInfo.jvmRunInfo.getOrElse(sys.error("missing jvmRunInfo")), log)
else nativeRun(runInfo.nativeRunInfo.getOrElse(sys.error("missing nativeRunInfo")))
finally inClientSideRun.set(false)
} }
def onRequest(msg: JsonRpcRequestMessage): Unit = { def onRequest(msg: JsonRpcRequestMessage): Unit = {
@ -941,14 +945,15 @@ class NetworkClient(
exitClean.set(false) exitClean.set(false)
close() close()
} }
if (cancelled.compareAndSet(false, true)) { if inClientSideRun.get() then ()
else if cancelled.compareAndSet(false, true) then
val cancelledTasks = { val cancelledTasks = {
val queue = sendCancelAllCommand() val queue = sendCancelAllCommand()
Option(queue.poll(1, TimeUnit.SECONDS)).getOrElse(true) Option(queue.poll(1, TimeUnit.SECONDS)).getOrElse(true)
} }
if ((batchMode.get && pendingResults.isEmpty) || !cancelledTasks) exitAbruptly() if (batchMode.get && pendingResults.isEmpty) || !cancelledTasks then exitAbruptly()
else cancelled.set(false) else cancelled.set(false)
} else exitAbruptly() // handles double ctrl+c to force a shutdown else exitAbruptly() // handles double ctrl+c to force a shutdown
} }
withSignalHandler(handler, Signals.INT) { withSignalHandler(handler, Signals.INT) {
def block(): Int = { def block(): Int = {