Merge pull request #825 from corda/feature/vkolomeyko/os-merge

OS->Ent merge
This commit is contained in:
Viktor Kolomeyko
2018-05-11 10:35:46 +01:00
committed by GitHub
29 changed files with 329 additions and 119 deletions

View File

@ -179,14 +179,21 @@ fun <T> Logger.logElapsedTime(label: String, body: () -> T): T = logElapsedTime(
fun <T> logElapsedTime(label: String, logger: Logger? = null, body: () -> T): T {
// Use nanoTime as it's monotonic.
val now = System.nanoTime()
var failed = false
try {
return body()
} finally {
}
catch (th: Throwable) {
failed = true
throw th
}
finally {
val elapsed = Duration.ofNanos(System.nanoTime() - now).toMillis()
val msg = (if(failed) "Failed " else "") + "$label took $elapsed msec"
if (logger != null)
logger.info("$label took $elapsed msec")
logger.info(msg)
else
println("$label took $elapsed msec")
println(msg)
}
}