From d55fafae93315f7acaffc0046c4b83eb612a5359 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 17 Dec 2015 21:43:48 +0300 Subject: [PATCH] Log final exit code instead of intermediate; change log level for build result to INFO Original commit: 4ec3865830087059b92ce11b9e24848abcb02dc6 --- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 34464c46c5c..e4f8db4a054 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -134,19 +134,19 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val fsOperations = FSOperationsHelper(context, chunk, LOG) try { - val exitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, fsOperations) - LOG.debug("Build result: " + exitCode) + val proposedExitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, fsOperations) - if (exitCode == OK && fsOperations.hasMarkedDirty()) return ADDITIONAL_PASS_REQUIRED + val actualExitCode = if (proposedExitCode == OK && fsOperations.hasMarkedDirty()) ADDITIONAL_PASS_REQUIRED else proposedExitCode - return exitCode + LOG.info("Build result: " + actualExitCode) + return actualExitCode } catch (e: StopBuildException) { - LOG.debug("Caught exception: " + e) + LOG.info("Caught exception: " + e) throw e } catch (e: Throwable) { - LOG.debug("Caught exception: " + e) + LOG.info("Caught exception: " + e) messageCollector.report( CompilerMessageSeverity.EXCEPTION,