Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] Refactored SimpleExecution.runWith* actions to take a Consumer<Throwable> in the event of an exception

This commit is contained in:
Robert von Burg 2024-02-27 12:01:42 +01:00
parent e91a96b549
commit a9067bf161
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
service/src/main/java/li/strolch/execution/policy/SimpleExecution.java
View File

@ -10,11 +10,12 @@ import li.strolch.model.timevalue.impl.FloatValue;
import li.strolch.model.timevalue.impl.ValueChange;
import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.utils.CheckedBiConsumer;
import li.strolch.utils.time.PeriodDuration;
import java.util.Locale;
import java.util.concurrent.ScheduledFuture;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Supplier;
/**
@ -39,8 +40,9 @@ public class SimpleExecution extends ExecutionPolicy {
protected void startWarningTask(PeriodDuration duration, Action action, Supplier<LogMessage> handler) {
if (this.warningTask != null) {
logger.warn("There is already a warning task registered, for action " + action.getLocator() +
". Cancelling and creating a new task...");
logger.warn("There is already a warning task registered, for action "
+ action.getLocator()
+ ". Cancelling and creating a new task...");
this.warningTask.cancel(true);
this.warningTask = null;
}
@ -150,18 +152,18 @@ public class SimpleExecution extends ExecutionPolicy {
return getContainer().getRealm(ctx.getCertificate()).openTx(ctx.getCertificate(), getClass(), readOnly);
}
protected void runWithFreshActionReadonly(BiConsumer<StrolchTransaction, Action> consumer,
Supplier<String> failMsgSupplier) {
runWithFreshAction(true, consumer, failMsgSupplier);
protected void runWithFreshActionReadonly(CheckedBiConsumer<StrolchTransaction, Action> consumer,
Consumer<Throwable> failHandler) {
runWithFreshAction(true, consumer, failHandler);
}
protected void runWithFreshActionWritable(BiConsumer<StrolchTransaction, Action> consumer,
Supplier<String> failMsgSupplier) {
runWithFreshAction(false, consumer, failMsgSupplier);
protected void runWithFreshActionWritable(CheckedBiConsumer<StrolchTransaction, Action> consumer,
Consumer<Throwable> failHandler) {
runWithFreshAction(false, consumer, failHandler);
}
private void runWithFreshAction(boolean readOnly, BiConsumer<StrolchTransaction, Action> consumer,
Supplier<String> failMsgSupplier) {
private void runWithFreshAction(boolean readOnly, CheckedBiConsumer<StrolchTransaction, Action> consumer,
Consumer<Throwable> failHandler) {
try {
runAsAgent(ctx -> {
try (StrolchTransaction tx = openLocalTx(ctx, readOnly)) {
@ -174,7 +176,7 @@ public class SimpleExecution extends ExecutionPolicy {
}
});
} catch (Exception e) {
logger.error(failMsgSupplier.get(), e);
failHandler.accept(e);
}
}
}