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

Extend supershell close timeout 

Fixes #6592

Problem
-------
On Heroku there's timeout.

Solution
--------
This seems to be coming from supershell closing the executor.
Extend the timeout to 30s.
This commit is contained in:
Eugene Yokota 2021-11-27 21:26:52 -05:00
parent a448b1caab
commit e3afa845ec
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() pending.clear()
scheduler.shutdownNow() scheduler.shutdownNow()
executor.shutdownNow() executor.shutdownNow()
if (!executor.awaitTermination(1, TimeUnit.SECONDS) || if (!executor.awaitTermination(30, TimeUnit.SECONDS) ||
!scheduler.awaitTermination(1, TimeUnit.SECONDS)) { !scheduler.awaitTermination(30, TimeUnit.SECONDS)) {
scala.Console.err.println("timed out closing the executor of supershell")
throw new TimeoutException throw new TimeoutException
} }
} }