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

Improve logging and exception handling in the daemon

Browse Source
This commit is contained in:
Ilya Chernikov
2017-07-19 10:01:08 +02:00
parent 904c7f9c64
commit 17a189a24b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+6 -5
View File
@@ -234,7 +234,7 @@ class CompileServiceImpl(
port = port.toString())) port = port.toString()))
try { try {
if (!runFile.createNewFile()) throw Exception("createNewFile returned false") if (!runFile.createNewFile()) throw Exception("createNewFile returned false")
} catch (e: Exception) { } catch (e: Throwable) {
throw IllegalStateException("Unable to create run file '${runFile.absolutePath}'", e) throw IllegalStateException("Unable to create run file '${runFile.absolutePath}'", e)
} }
runFile.deleteOnExit() runFile.deleteOnExit()
@@ -598,7 +598,7 @@ class CompileServiceImpl(
try { try {
body() body()
} }
catch (e: Exception) { catch (e: Throwable) {
System.err.println("Exception in timer thread: " + e.message) System.err.println("Exception in timer thread: " + e.message)
e.printStackTrace(System.err) e.printStackTrace(System.err)
log.log(Level.SEVERE, "Exception in timer thread", e) log.log(Level.SEVERE, "Exception in timer thread", e)
@@ -667,6 +667,7 @@ class CompileServiceImpl(
ifAliveUnit { ifAliveUnit {
log.info("initiate elections")
val aliveWithOpts = walkDaemons(File(daemonOptions.runFilesPathOrDefault), compilerId, runFile, filter = { _, p -> p != port }, report = { _, msg -> log.info(msg) }).toList() val aliveWithOpts = walkDaemons(File(daemonOptions.runFilesPathOrDefault), compilerId, runFile, filter = { _, p -> p != port }, report = { _, msg -> log.info(msg) }).toList()
val comparator = compareByDescending<DaemonWithMetadata, DaemonJVMOptions>(DaemonJVMOptionsMemoryComparator(), { it.jvmOptions }) val comparator = compareByDescending<DaemonWithMetadata, DaemonJVMOptions>(DaemonJVMOptionsMemoryComparator(), { it.jvmOptions })
.thenBy(FileAgeComparator()) { it.runFile } .thenBy(FileAgeComparator()) { it.runFile }
@@ -682,7 +683,7 @@ class CompileServiceImpl(
} }
daemon.scheduleShutdown(true) daemon.scheduleShutdown(true)
} }
catch (e: Exception) { catch (e: Throwable) {
log.info("Cannot connect to a daemon, assuming dying ('${runFile.canonicalPath}'): ${e.message}") log.info("Cannot connect to a daemon, assuming dying ('${runFile.canonicalPath}'): ${e.message}")
} }
} }
@@ -883,7 +884,7 @@ class CompileServiceImpl(
return res return res
} }
// TODO: consider possibilities to handle OutOfMemory // TODO: consider possibilities to handle OutOfMemory
catch (e: Exception) { catch (e: Throwable) {
log.info("Error: $e") log.info("Error: $e")
throw e throw e
} }
@@ -927,7 +928,7 @@ class CompileServiceImpl(
try { try {
body() body()
} }
catch (e: Exception) { catch (e: Throwable) {
log.log(Level.SEVERE, "Exception", e) log.log(Level.SEVERE, "Exception", e)
CompileService.CallResult.Error(e.message ?: "unknown") CompileService.CallResult.Error(e.message ?: "unknown")
} }