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

Treat daemon startup timeout/error exceptions the same way as RMI errors

Browse Source 
will result on regular retry cycle on them, hopefully eliminating or
reducing appropriate exception reports
This commit is contained in:
Ilya Chernikov
2017-12-15 11:56:11 +01:00
parent ea5a52f918
commit 775eeb75c9
1 changed files with 3 additions and 2 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
+3 -2
View File
@@ -319,6 +319,7 @@ object KotlinCompilerClient {
catch (e: ConnectException) { null to e } catch (e: ConnectException) { null to e }
catch (e: ConnectIOException) { null to e } catch (e: ConnectIOException) { null to e }
catch (e: UnmarshalException) { null to e } catch (e: UnmarshalException) { null to e }
catch (e: RuntimeException) { null to e }
if (res != null) return res if (res != null) return res
@@ -420,9 +421,9 @@ 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 with error code: ${daemon.exitValue()}") throw RuntimeException("Daemon terminated unexpectedly with error code: ${daemon.exitValue()}")
if (!succeeded) if (!succeeded)
throw Exception("Unable to get response from daemon in $daemonStartupTimeout ms") throw RuntimeException("Unable to get response from daemon in $daemonStartupTimeout ms")
} }
else else
// without startEcho defined waiting for max timeout // without startEcho defined waiting for max timeout