dorkbox
/
Executor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More careful 1.8 implementation

master
Robinson 2023-01-22 21:36:28 +01:00
parent 7958b67617
commit 29f77e5713
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dorkbox/executor/DeferredProcessResult.kt
View File

@ -1,6 +1,6 @@
/*
* Copyright 2020 dorkbox, llc
* Copyright 2023 dorkbox, llc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@ -32,11 +32,11 @@ import org.slf4j.LoggerFactory
import org.slf4j.MDC
import java.io.ByteArrayOutputStream
import java.io.IOException
import java.util.concurrent.ExecutionException
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException
import java.util.concurrent.*
import kotlin.text.Charsets.UTF_8
internal data class Params(
/**
* Set of main attributes used to start the process.
@ -212,7 +212,7 @@ class DeferredProcessResult internal constructor(private val process: Process,
try {
// always do this
waiter.doNotify()
} catch (ignored: CancellationException) {
} catch (ignored: Exception) {
// we want to ignore any cancellation exceptions
}
}
@ -287,7 +287,7 @@ class DeferredProcessResult internal constructor(private val process: Process,
withTimeoutOrNull(timeoutUnit.toMillis(timeout)) {
try {
waiter.doWait()
} catch (ignored: CancellationException) {
} catch (ignored: Exception) {
// we want to ignore any cancellation exceptions
}
}
@ -547,10 +547,18 @@ class DeferredProcessResult internal constructor(private val process: Process,
}
private fun getUnitsAsString(timeout: Long, timeUnit: TimeUnit): String {
val result = timeUnit.toChronoUnit().name
return if (timeout == 1L) {
val result = when (timeUnit) {
TimeUnit.NANOSECONDS -> "nano"
TimeUnit.MICROSECONDS -> "micro"
TimeUnit.MILLISECONDS -> "milli"
TimeUnit.SECONDS -> "second"
TimeUnit.MINUTES -> "minute"
TimeUnit.HOURS -> "hour"
TimeUnit.DAYS -> "day"
}
return if (timeout > 1L) {
// fix plurality
result.substring(0, result.length - 1)
result + "s"
} else {
result
}