From 0fbcfddf4adbced023e2f13584159d2c189d9425 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Tue, 26 May 2015 12:36:13 +0300 Subject: [PATCH] Gradle: debug message prefix added --- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 10 ++++++++ .../gradle/plugin/FinishBuildListener.kt | 22 +++++++++--------- .../kotlin/gradle/plugin/KotlinPlugin.kt | 16 ++++++------- .../gradle/plugin/KotlinPluginWrapper.kt | 23 +++++++++++-------- .../gradle/plugin/kotlinPluginVersion.kt | 4 ++-- 5 files changed, 45 insertions(+), 30 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 6f33f717472..befbbef751b 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -111,9 +111,11 @@ public open class KotlinCompile() : AbstractKotlinCompile + getLogger().kotlinDebug("args.pluginClasspaths = ${args.pluginClasspaths.joinToString(File.pathSeparator)}") val basePluginOptions = (extraProperties.get("compilerPluginArguments") as? Array) ?: array() val pluginOptions = arrayListOf(*basePluginOptions) @@ -135,12 +139,14 @@ public open class KotlinCompile() : AbstractKotlinCompile().getDeclaredField("threadLocals") @@ -72,24 +72,24 @@ class FinishBuildListener(var pluginClassLoader: ParentLastURLClassLoader?) : Bu } } - log.debug("Removing ChildURLClassLoader thread locals finished successfully") + log.kotlinDebug("Removing ChildURLClassLoader thread locals finished successfully") } catch (e: Throwable) { - log.debug("Exception during thread locals remove: " + e) + log.kotlinDebug("Exception during thread locals remove: " + e) } } private fun stopZipFileCache() { callVoidStaticMethod("com.intellij.openapi.util.io.ZipFileCache", "stopBackgroundThread") - log.debug("ZipFileCache finished successfully") + log.kotlinDebug("ZipFileCache finished successfully") } private fun stopLowMemoryWatcher() { callVoidStaticMethod("com.intellij.openapi.util.LowMemoryWatcher", "stopAll") - log.debug("LowMemoryWatcher finished successfully") + log.kotlinDebug("LowMemoryWatcher finished successfully") } private fun stopJobScheduler() { - log.debug("Stop JobScheduler") + log.kotlinDebug("Stop JobScheduler") val jobSchedulerClass = Class.forName("com.intellij.concurrency.JobScheduler", false, pluginClassLoader) @@ -97,19 +97,19 @@ class FinishBuildListener(var pluginClassLoader: ParentLastURLClassLoader?) : Bu val executorService = getSchedulerMethod.invoke(this) as ScheduledExecutorService executorService.shutdown() - log.debug("JobScheduler stopped") + log.kotlinDebug("JobScheduler stopped") } private fun callVoidStaticMethod(classFqName: String, methodName: String) { val shortName = classFqName.substring(classFqName.lastIndexOf('.') + 1) - log.debug("Looking for $shortName class") + log.kotlinDebug("Looking for $shortName class") val lowMemoryWatcherClass = Class.forName(classFqName, false, pluginClassLoader) - log.debug("Looking for $methodName() method") + log.kotlinDebug("Looking for $methodName() method") val shutdownMethod = lowMemoryWatcherClass.getMethod(methodName) - log.debug("Call $shortName.$methodName()") + log.kotlinDebug("Call $shortName.$methodName()") shutdownMethod.invoke(null) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index de1de60fb7c..56f150fedbd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -82,7 +82,7 @@ abstract class KotlinSourceSetProcessor( open protected fun createKotlinSourceSet(): KotlinSourceSet? = if (sourceSet is HasConvention) { - logger.debug("Creating KotlinSourceSet for source set ${sourceSet}") + logger.kotlinDebug("Creating KotlinSourceSet for source set ${sourceSet}") val kotlinSourceSet = KotlinSourceSetImpl(sourceSet.getName(), project.getFileResolver()) sourceSet.getConvention().getPlugins().put(pluginName, kotlinSourceSet) kotlinSourceSet @@ -92,14 +92,14 @@ abstract class KotlinSourceSetProcessor( open protected fun createKotlinDirSet(): SourceDirectorySet? { val srcDir = project.file(sourceRootDir) - logger.debug("Creating Kotlin SourceDirectorySet for source set ${kotlinSourceSet} with src dir ${srcDir}") + logger.kotlinDebug("Creating Kotlin SourceDirectorySet for source set ${kotlinSourceSet} with src dir ${srcDir}") val kotlinDirSet = kotlinSourceSet?.getKotlin() kotlinDirSet?.srcDir(srcDir) return kotlinDirSet } open protected fun addSourcesToKotlinDirSet() { - logger.debug("Adding Kotlin SourceDirectorySet ${kotlinDirSet} to source set ${sourceSet}") + logger.kotlinDebug("Adding Kotlin SourceDirectorySet ${kotlinDirSet} to source set ${sourceSet}") sourceSet.getAllJava()?.source(kotlinDirSet) sourceSet.getAllSource()?.source(kotlinDirSet) sourceSet.getResources()?.getFilter()?.exclude { kotlinDirSet!!.contains(it.getFile()) } @@ -107,7 +107,7 @@ abstract class KotlinSourceSetProcessor( open protected fun createKotlinCompileTask(): T { val name = sourceSet.getCompileTaskName(compileTaskNameSuffix) - logger.debug("Creating kotlin compile task $name with class $compilerClass") + logger.kotlinDebug("Creating kotlin compile task $name with class $compilerClass") return project.getTasks().create(name, compilerClass) } @@ -329,7 +329,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t })) but those methods were removed so commented as temporary hack*/ - project.getLogger().debug("Created kotlin sourceDirectorySet at ${kotlinDirSet.getSrcDirs()}") + project.getLogger().kotlinDebug("Created kotlin sourceDirectorySet at ${kotlinDirSet.getSrcDirs()}") } }) @@ -363,7 +363,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t for (variantData in variantDataList) { val variantDataName = variantData.getName() - logger.debug("Process variant [$variantDataName]") + logger.kotlinDebug("Process variant [$variantDataName]") val javaTask = variantData.javaCompileTask @@ -384,7 +384,7 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t fun SourceDirectorySet.addSourceDirectories(additionalSourceFiles: Collection) { for (dir in additionalSourceFiles) { this.srcDir(dir) - logger.debug("Source directory ${dir.getAbsolutePath()} was added to kotlin source for $kotlinTaskName") + logger.kotlinDebug("Source directory ${dir.getAbsolutePath()} was added to kotlin source for $kotlinTaskName") } } @@ -496,7 +496,7 @@ private class SubpluginEnvironment( val args = subplugin.getExtraArguments(project, compileTask) with (subplugin) { - logger.debug("Subplugin ${getPluginName()} (${getGroupName()}:${getArtifactName()}) loaded.") + logger.kotlinDebug("Subplugin ${getPluginName()} (${getGroupName()}:${getArtifactName()}) loaded.") } val subpluginClasspath = subpluginClasspaths[subplugin] diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt index 1b0ab09a724..d03daf91acf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt @@ -10,6 +10,7 @@ import java.util.Properties import java.io.FileNotFoundException import org.gradle.api.initialization.dsl.ScriptHandler import org.gradle.api.invocation.Gradle +import org.gradle.api.logging.Logger import java.lang.reflect.Method import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider @@ -41,33 +42,33 @@ abstract class KotlinBasePluginWrapper: Plugin { val dependencyHandler: DependencyHandler = sourceBuildScript.getDependencies() val configurationsContainer: ConfigurationContainer = sourceBuildScript.getConfigurations() - log.debug("Creating configuration and dependency") + log.kotlinDebug("Creating configuration and dependency") val kotlinPluginCoreCoordinates = "org.jetbrains.kotlin:kotlin-gradle-plugin-core:" + projectVersion val dependency = dependencyHandler.create(kotlinPluginCoreCoordinates) val configuration = configurationsContainer.detachedConfiguration(dependency) - log.debug("Resolving [" + kotlinPluginCoreCoordinates + "]") + log.kotlinDebug("Resolving [" + kotlinPluginCoreCoordinates + "]") val kotlinPluginDependencies: List = configuration.getResolvedConfiguration().getFiles({ true })!!.map { it.toURI().toURL() } - log.debug("Resolved files: [" + kotlinPluginDependencies.toString() + "]") - log.debug("Load plugin in parent-last URL classloader") + log.kotlinDebug("Resolved files: [" + kotlinPluginDependencies.toString() + "]") + log.kotlinDebug("Load plugin in parent-last URL classloader") val kotlinPluginClassloader = ParentLastURLClassLoader(kotlinPluginDependencies, this.javaClass.getClassLoader()) - log.debug("Class loader created") + log.kotlinDebug("Class loader created") return kotlinPluginClassloader } private fun findSourceBuildScript(project: Project): ScriptHandler? { - log.debug("Looking for proper script handler") + log.kotlinDebug("Looking for proper script handler") var curProject = project while (curProject != curProject.getParent()) { - log.debug("Looking in project $project") + log.kotlinDebug("Looking in project $project") val scriptHandler = curProject.getBuildscript() val found = scriptHandler.getConfigurations().findByName("classpath")?.firstOrNull { it.name.contains("kotlin-gradle-plugin") } != null if (found) { - log.debug("Found! returning...") + log.kotlinDebug("Found! returning...") return scriptHandler } - log.debug("not found, switching to parent") + log.kotlinDebug("not found, switching to parent") curProject = curProject.getParent()!! } return null @@ -86,3 +87,7 @@ open class Kotlin2JsPluginWrapper : KotlinBasePluginWrapper() { override fun getPlugin(pluginClassLoader: ParentLastURLClassLoader, scriptHandler: ScriptHandler) = Kotlin2JsPlugin(scriptHandler, KotlinTasksProvider(pluginClassLoader)) } +fun Logger.kotlinDebug(message: String) { + this.debug("[KOTLIN] $message") +} + diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/kotlinPluginVersion.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/kotlinPluginVersion.kt index 432f2780da8..b430f891c36 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/kotlinPluginVersion.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/kotlinPluginVersion.kt @@ -21,7 +21,7 @@ import java.io.FileNotFoundException import java.util.* private fun Any.loadKotlinVersionFromResource(log: Logger): String { - log.debug("Loading version information") + log.kotlinDebug("Loading version information") val props = Properties() val propFileName = "project.properties" val inputStream = javaClass.getClassLoader()!!.getResourceAsStream(propFileName) @@ -33,6 +33,6 @@ private fun Any.loadKotlinVersionFromResource(log: Logger): String { props.load(inputStream) val projectVersion = props["project.version"] as String - log.debug("Found project version [$projectVersion]") + log.kotlinDebug("Found project version [$projectVersion]") return projectVersion } \ No newline at end of file