From 19a782d62a6dcde3aeb73fcadbd4b3c31c7f05ec Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Mon, 27 Mar 2017 15:06:25 -0700 Subject: [PATCH] Revert "Allow ParallelLogger to log from apply()." This reverts commit 67dd7e54e9ff2f8a0ad0ba67a5695a69b4bd52dc. --- .../com/beust/kobalt/internal/ParallelLogger.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt index 4062c91d..7fda0eac 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt @@ -32,17 +32,15 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger { val newLine: Boolean) private val logLines = ConcurrentHashMap>() - private val runningProjects = ConcurrentLinkedQueue() + private val runningProjects = ConcurrentLinkedQueue() var startTime: Long? = null fun onProjectStarted(name: String) { if (startTime == null) { startTime = System.currentTimeMillis() } - if (! runningProjects.contains(name)) { - runningProjects.add(name) - logLines[name] = arrayListOf() - } + runningProjects.add(name) + logLines[name] = arrayListOf() if (currentName == null) { currentName = name } @@ -76,7 +74,7 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger { } val LOCK = Any() - var currentName: CharSequence? = null + var currentName: String? = null set(newName) { field = newName } @@ -121,9 +119,6 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger { if (args.sequential) { kobaltLog(level, message, newLine) } else { - if (! runningProjects.contains(tag)) { - runningProjects.add(tag) - } addLogLine(tag, LogLine(tag, level, message, Type.LOG, newLine)) } }