ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve failure message for jar runner

Browse source
This commit is contained in:
Jason Penilla 2021-12-18 20:34:45 -08:00
parent 1f50d6696f
commit d1647fa2cc
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
paperweight-lib/src/main/kotlin/util/jar-runner.kt
View file

@ -50,14 +50,14 @@ fun JavaLauncher.runJar(
val dir = workingDir.convertToPath()
val output = when {
logFile is OutputStream -> logFile
val (logFilePath, output) = when {
logFile is OutputStream -> Pair(null, logFile)
logFile != null -> {
val log = logFile.convertToPath()
log.parent.createDirectories()
log.outputStream().buffered()
Pair(log, log.outputStream().buffered())
}
else -> UselessOutputStream
else -> Pair(null, UselessOutputStream)
}
val processBuilder = ProcessBuilder(
@ -80,9 +80,10 @@ fun JavaLauncher.runJar(
redirect(process.inputStream, it)
redirect(process.errorStream, it)
val e = process.waitFor()
if (e != 0) {
throw PaperweightException("Execution of ${classpath.asPath} failed with exit code $e")
val exit = process.waitFor()
if (exit != 0) {
val logMsg = logFilePath?.let { p -> " Log file: ${p.absolutePathString()}" } ?: ""
throw PaperweightException("Execution of '$mainClass' failed with exit code $exit.$logMsg Classpath: ${classpath.asPath}")
}
}
}