MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[build scripts] diagnostics: fix publishing of idea.log from a failed appStarter process which uses PerProcessPathCustomizer

Browse Source 
This is a followup to IJPL-148515. Since the frontend variants use PerProcessPathCustomizer, they put idea.log to a subdirectory of 'log' directory, so the code is adapted to find them there.

GitOrigin-RevId: 49a6a6a6884c91d4a9ac1f4dfe0e133d35df62b2
This commit is contained in:
Nikolay Chashnikov
2024-05-02 10:23:04 +02:00
committed by intellij-monorepo-bot
parent 8f93d297d9
commit ee8294b9db
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/build-scripts/src/org/jetbrains/intellij/build/impl/productRunner/IntellijProcessStarter.kt
View File

@@ -4,6 +4,7 @@ package org.jetbrains.intellij.build.impl.productRunner
import com.intellij.openapi.application.PathManager
import com.intellij.util.lang.HashMapZipFile
import com.intellij.util.xml.dom.readXmlAsModel
import com.jetbrains.plugin.structure.base.utils.exists
import io.opentelemetry.api.trace.Span
import org.jetbrains.intellij.build.BuildContext
import org.jetbrains.intellij.build.CompilationContext
@@ -15,7 +16,10 @@ import java.nio.file.Files
import java.nio.file.NoSuchFileException
import java.nio.file.Path
import java.nio.file.StandardCopyOption
import kotlin.io.path.ExperimentalPathApi
import kotlin.io.path.createTempDirectory
import kotlin.io.path.name
import kotlin.io.path.walk
import kotlin.time.Duration
/**
@@ -30,7 +34,8 @@ suspend fun runApplicationStarter(
homePath: Path = context.paths.projectHome,
timeout: Duration = DEFAULT_TIMEOUT,
) {
val tempDir = createTempDirectory(context.paths.tempDir, arguments.firstOrNull() ?: "appStarter")
val tempFileNamePrefix = arguments.firstOrNull() ?: "appStarter"
val tempDir = createTempDirectory(context.paths.tempDir, tempFileNamePrefix)
Files.createDirectories(tempDir)
val jvmArgs = mutableListOf<String>()
val systemDir = tempDir.resolve("system")
@@ -69,9 +74,9 @@ suspend fun runApplicationStarter(
classPath = effectiveIdeClasspath.toList(),
timeout = timeout
) {
val logFile = systemDir.resolve("log").resolve("idea.log")
if (Files.exists(logFile)) {
val logFileToPublish = Files.createTempFile("idea-", ".log")
val logFile = findLogFile(systemDir)
if (logFile != null) {
val logFileToPublish = Files.createTempFile(tempFileNamePrefix, ".log")
Files.copy(logFile, logFileToPublish, StandardCopyOption.REPLACE_EXISTING)
context.notifyArtifactBuilt(logFileToPublish)
Span.current().addEvent("log file $logFileToPublish attached to build artifacts")
@@ -79,6 +84,17 @@ suspend fun runApplicationStarter(
}
}
@OptIn(ExperimentalPathApi::class)
private fun findLogFile(systemDir: Path): Path? {
val logDir = systemDir.resolve("log")
val defaultLog = logDir.resolve("idea.log")
if (defaultLog.exists()) {
return defaultLog
}
//variants of IDEs which use 'PerProcessPathCustomizer' store idea.log in a subdirectory of logDir
return logDir.walk().filter { it.name == "idea.log" }.firstOrNull()
}
private fun readPluginId(pluginJar: Path): String? {
if (!pluginJar.toString().endsWith(".jar") || !Files.isRegularFile(pluginJar)) {
return null