boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-22 20:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ignore failure after task runner canceled

Browse source
This commit is contained in:
woodser 2024-05-16 12:42:05 -04:00
parent 58cead6035
commit 76859f822e
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/src/main/java/haveno/common/taskrunner/Task.java
View file

@ -74,6 +74,7 @@ public abstract class Task<T extends Model> {
// t.printStackTrace(pw); // t.printStackTrace(pw);
// errorMessage = sw.toString(); // errorMessage = sw.toString();
if (taskHandler.isCanceled()) return;
errorMessage = t.getMessage() + " (task " + getClass().getSimpleName() + ")"; errorMessage = t.getMessage() + " (task " + getClass().getSimpleName() + ")";
log.error(errorMessage, t); log.error(errorMessage, t);
taskHandler.handleErrorMessage(errorMessage); taskHandler.handleErrorMessage(errorMessage);

5
common/src/main/java/haveno/common/taskrunner/TaskRunner.java
View file

@ -80,11 +80,16 @@ public class TaskRunner<T extends Model> {
isCanceled = true; isCanceled = true;
} }
public boolean isCanceled() {
return isCanceled;
}
void handleComplete() { void handleComplete() {
next(); next();
} }
void handleErrorMessage(String errorMessage) { void handleErrorMessage(String errorMessage) {
if (isCanceled) return;
log.error("Task failed: " + currentTask.getSimpleName() + " / errorMessage: " + errorMessage); log.error("Task failed: " + currentTask.getSimpleName() + " / errorMessage: " + errorMessage);
failed = true; failed = true;
errorMessageHandler.handleErrorMessage(errorMessage); errorMessageHandler.handleErrorMessage(errorMessage);

4
core/src/main/java/haveno/core/offer/placeoffer/PlaceOfferProtocol.java
View file

@ -41,6 +41,7 @@ public class PlaceOfferProtocol {
private Timer timeoutTimer; private Timer timeoutTimer;
private final TransactionResultHandler resultHandler; private final TransactionResultHandler resultHandler;
private final ErrorMessageHandler errorMessageHandler; private final ErrorMessageHandler errorMessageHandler;
private TaskRunner<PlaceOfferModel> taskRunner;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -65,7 +66,7 @@ public class PlaceOfferProtocol {
startTimeoutTimer(); startTimeoutTimer();
TaskRunner<PlaceOfferModel> taskRunner = new TaskRunner<>(model, taskRunner = new TaskRunner<>(model,
() -> { () -> {
// reset timer if response not yet received // reset timer if response not yet received
@ -145,6 +146,7 @@ public class PlaceOfferProtocol {
private void handleError(String errorMessage) { private void handleError(String errorMessage) {
if (timeoutTimer != null) { if (timeoutTimer != null) {
taskRunner.cancel();
log.error(errorMessage); log.error(errorMessage);
stopTimeoutTimer(); stopTimeoutTimer();
model.getOpenOffer().getOffer().setErrorMessage(errorMessage); model.getOpenOffer().getOffer().setErrorMessage(errorMessage);