From e3afa845ec00f13c55041d1a719d86cbf90602e6 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 27 Nov 2021 21:26:52 -0500 Subject: [PATCH] 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. --- main/src/main/scala/sbt/internal/TaskProgress.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/internal/TaskProgress.scala b/main/src/main/scala/sbt/internal/TaskProgress.scala index cf9ce2e88..65fea78fc 100644 --- a/main/src/main/scala/sbt/internal/TaskProgress.scala +++ b/main/src/main/scala/sbt/internal/TaskProgress.scala @@ -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 } }