From 56182746b5739fc9c952b1edebb80f0daedc1851 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Apr 2017 21:36:49 +0300 Subject: [PATCH] Fix printing daemon client messages Fixing the problem introduced in the commit 9819de1abd4539edb555b0c0e24f1a4090ef473f: the daemon client messages should be reported when the debug log level is enabled or when the connection not successful #KT-17199 fixed --- .../compilerRunner/KotlinCompilerRunner.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index a6d48da9ebd..ed60028fcef 100644 --- a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -68,10 +68,7 @@ abstract class KotlinCompilerRunner { val daemonJVMOptions = configureDaemonJVMOptions(inheritMemoryLimits = true, inheritAdditionalProperties = true) val daemonReportMessages = ArrayList() - val daemonReportingTargets = when { - log.isDebugEnabled -> DaemonReportingTargets(messages = daemonReportMessages) - else -> DaemonReportingTargets(messageCollector = environment.messageCollector) - } + val daemonReportingTargets = DaemonReportingTargets(messages = daemonReportMessages) val profiler = if (daemonOptions.reportPerf) WallAndThreadAndMemoryTotalProfiler(withGC = false) else DummyProfiler() @@ -86,10 +83,15 @@ abstract class KotlinCompilerRunner { sessionAliveFlagFile = sessionAliveFlagFile) } - for (msg in daemonReportMessages) { - environment.messageCollector.report(CompilerMessageSeverity.INFO, - (if (msg.category == DaemonReportCategory.EXCEPTION && connection == null) "Falling back to compilation without daemon due to error: " else "") + msg.message, - CompilerMessageLocation.NO_LOCATION) + if (connection == null || log.isDebugEnabled) { + for (message in daemonReportMessages) { + val severity = when(message.category) { + DaemonReportCategory.DEBUG -> CompilerMessageSeverity.INFO + DaemonReportCategory.INFO -> CompilerMessageSeverity.INFO + DaemonReportCategory.EXCEPTION -> CompilerMessageSeverity.EXCEPTION + } + environment.messageCollector.report(severity, message.message, CompilerMessageLocation.NO_LOCATION) + } } fun reportTotalAndThreadPerf(message: String, daemonOptions: DaemonOptions, messageCollector: MessageCollector, profiler: Profiler) {