azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor: improve daemon start failure diagnostic

Browse Source
This commit is contained in:
Ilya Chernikov
2017-03-29 20:04:52 +02:00
parent a309511adf
commit 234ad39fd6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+2 -1
View File
@@ -447,7 +447,7 @@ object KotlinCompilerClient {
if (daemonOptions.runFilesPath.isNotEmpty()) { if (daemonOptions.runFilesPath.isNotEmpty()) {
val succeeded = isEchoRead.tryAcquire(daemonStartupTimeout, TimeUnit.MILLISECONDS) val succeeded = isEchoRead.tryAcquire(daemonStartupTimeout, TimeUnit.MILLISECONDS)
if (!isProcessAlive(daemon)) if (!isProcessAlive(daemon))
throw Exception("Daemon terminated unexpectedly") throw Exception("Daemon terminated unexpectedly with error code: ${daemon.exitValue()}")
if (!succeeded) if (!succeeded)
throw Exception("Unable to get response from daemon in $daemonStartupTimeout ms") throw Exception("Unable to get response from daemon in $daemonStartupTimeout ms")
} }
@@ -461,6 +461,7 @@ object KotlinCompilerClient {
// TODO: find better method to stop the thread, but seems it will require asynchronous consuming of the stream // TODO: find better method to stop the thread, but seems it will require asynchronous consuming of the stream
stdoutThread.stop() stdoutThread.stop()
} }
reportingTargets.out?.flush()
} }
} }
} }