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

Merge pull request #6729 from eed3si9n/wip/timeout 

Extend supershell close timeout
This commit is contained in:
eugene yokota 2021-11-27 23:28:12 -05:00 committed by GitHub
parent a448b1caab e3afa845ec
commit 54f6a49a9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/internal/TaskProgress.scala
View File

@ -70,8 +70,9 @@ private[sbt] class TaskProgress(
pending.clear()
scheduler.shutdownNow()
executor.shutdownNow()
if (!executor.awaitTermination(1, TimeUnit.SECONDS) ||
!scheduler.awaitTermination(1, TimeUnit.SECONDS)) {
if (!executor.awaitTermination(30, TimeUnit.SECONDS) ||
!scheduler.awaitTermination(30, TimeUnit.SECONDS)) {
scala.Console.err.println("timed out closing the executor of supershell")
throw new TimeoutException
}
}