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

Merge pull request #5019 from eatkins/task-timings 

Fix task timings
This commit is contained in:
eugene yokota 2019-09-02 01:04:03 -04:00 committed by GitHub
parent a7dd86939f 30ede13a09
commit 7018d6ebf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/src/main/scala/sbt/EvaluateTask.scala
View File

@ -156,12 +156,8 @@ object EvaluateTask {
lazy private val sharedProgress = new TaskTimings(reportOnShutdown = true)
def taskTimingProgress: Option[ExecuteProgress[Task]] =
if (SysProp.taskTimings) {
if (SysProp.taskTimingsOnShutdown)
Some(sharedProgress)
else
Some(new TaskTimings(reportOnShutdown = false))
} else None
if (SysProp.taskTimingsOnShutdown) Some(sharedProgress)
else None
lazy private val sharedTraceEvent = new TaskTraceEvent()
def taskTraceEvent: Option[ExecuteProgress[Task]] =
@ -240,7 +236,8 @@ object EvaluateTask {
extracted,
structure
)
val reporters = maker map { _.progress }
val reporters = maker.map(_.progress) ++
(if (SysProp.taskTimings) new TaskTimings(reportOnShutdown = false) :: Nil else Nil)
// configure the logger for super shell
ConsoleAppender.setShowProgress((reporters collect {
case p: TaskProgress => ()