mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-04 03:03:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Factor out executor shutdown logic into new Utilities method

Browse source
This commit is contained in:
Steven Barclay 2020-12-20 23:59:42 +00:00
parent b7c7eaf1f2
commit 863392bc74
No known key found for this signature in database
GPG key ID: 9FED6BF1176D500B
4 changed files with 22 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/src/main/java/bisq/common/util/Utilities.java
View file

@ -126,11 +126,11 @@ public class Utilities {
new ArrayBlockingQueue<>(maximumPoolSize));
}
public static ThreadPoolExecutor getThreadPoolExecutor(String name,
int corePoolSize,
int maximumPoolSize,
long keepAliveTimeInSec,
BlockingQueue<Runnable> workQueue) {
private static ThreadPoolExecutor getThreadPoolExecutor(String name,
int corePoolSize,
int maximumPoolSize,
long keepAliveTimeInSec,
BlockingQueue<Runnable> workQueue) {
final ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setNameFormat(name)
.setDaemon(true)
@ -142,7 +142,6 @@ public class Utilities {
return executor;
}
@SuppressWarnings("SameParameterValue")
public static ScheduledThreadPoolExecutor getScheduledThreadPoolExecutor(String name,
int corePoolSize,
@ -162,6 +161,18 @@ public class Utilities {
return executor;
}
// TODO: Can some/all of the uses of this be replaced by guava MoreExecutors.shutdownAndAwaitTermination(..)?
public static void shutdownAndAwaitTermination(ExecutorService executor, long timeout, TimeUnit unit) {
executor.shutdown();
try {
if (!executor.awaitTermination(timeout, unit)) {
executor.shutdownNow();
}
} catch (InterruptedException e) {
executor.shutdownNow();
}
}
/**
* @return true if <code>defaults read -g AppleInterfaceStyle</code> has an exit status of <code>0</code> (i.e. _not_ returning "key not found").
*/

16
core/src/main/java/bisq/core/dao/node/full/rpc/BitcoindDaemon.java
View file

@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@ -79,8 +78,8 @@ public class BitcoindDaemon {
} catch (IOException e) {
log.error("Error closing block notification server socket", e);
} finally {
shutdownAndAwaitTermination(executor, 1);
shutdownAndAwaitTermination(workerPool, 5);
Utilities.shutdownAndAwaitTermination(executor, 1, TimeUnit.SECONDS);
Utilities.shutdownAndAwaitTermination(workerPool, 5, TimeUnit.SECONDS);
}
}
@ -101,17 +100,6 @@ public class BitcoindDaemon {
};
}
private static void shutdownAndAwaitTermination(ExecutorService executor, long timeoutInSeconds) {
executor.shutdown();
try {
if (!executor.awaitTermination(timeoutInSeconds, TimeUnit.SECONDS)) {
executor.shutdownNow();
}
} catch (InterruptedException e) {
executor.shutdownNow();
}
}
public interface BlockListener {
void blockDetected(String blockHash);
}

10
core/src/main/java/bisq/core/provider/price/PriceRequest.java
View file

@ -78,14 +78,6 @@ public class PriceRequest {
if (provider != null) {
provider.shutDown();
}
executorService.shutdown();
try {
if (!executorService.awaitTermination(1, TimeUnit.SECONDS)) {
executorService.shutdownNow();
}
} catch (InterruptedException e) {
executorService.shutdownNow();
}
Utilities.shutdownAndAwaitTermination(executorService, 1, TimeUnit.SECONDS);
}
}

10
monitor/src/main/java/bisq/monitor/Metric.java
View file

@ -18,6 +18,7 @@
package bisq.monitor;
import bisq.common.app.Version;
import bisq.common.util.Utilities;
import java.util.Properties;
import java.util.Random;
@ -141,13 +142,6 @@ public abstract class Metric extends Configurable implements Runnable {
* shut down or after one minute.
*/
public static void haltAllMetrics() {
executor.shutdown();
try {
if (!Metric.executor.awaitTermination(2, TimeUnit.MINUTES))
Metric.executor.shutdownNow();
} catch (InterruptedException e) {
Metric.executor.shutdownNow();
}
Utilities.shutdownAndAwaitTermination(executor, 2, TimeUnit.MINUTES);
}
}