From 9c22adc97d63f0ffce15b2f594400dbd2ab25a0d Mon Sep 17 00:00:00 2001 From: JaniruTEC Date: Mon, 26 Oct 2020 21:15:37 +0100 Subject: [PATCH] Added/Fixed error logging Added error logging to VaultStats and GeneralPreferencesController Fixed possible missing error logging in VaultService --- .../main/java/org/cryptomator/common/vaults/VaultStats.java | 1 + .../main/java/org/cryptomator/ui/common/VaultService.java | 3 ++- .../ui/preferences/GeneralPreferencesController.java | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java index 69564b876..2da8fa288 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java @@ -36,6 +36,7 @@ public class VaultStats { this.updateService = new UpdateStatsService(); updateService.setExecutor(executor); updateService.setPeriod(Duration.seconds(1)); + updateService.setOnFailed(event -> LOG.error("Error in UpdateStateService.", event.getSource().getException())); state.addListener(this::vaultStateChanged); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java index 8aadd8c98..da9f58ecb 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java @@ -69,7 +69,6 @@ public class VaultService { public Task createLockTask(Vault vault, boolean forced) { Task task = new LockVaultTask(vault, forced); task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayName())); - task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayName(), evt.getSource().getException())); return task; } @@ -165,6 +164,8 @@ public class VaultService { public LockVaultTask(Vault vault, boolean forced) { this.vault = vault; this.forced = forced; + + setOnFailed(event -> LOG.error("Failed to lock " + vault.getDisplayName(), event.getSource().getException())); } @Override diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java index fdec00d62..926749dfa 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java @@ -109,7 +109,10 @@ public class GeneralPreferencesController implements FxController { autoStartStrategy.ifPresent(autoStart -> { boolean enableAutoStart = autoStartCheckbox.isSelected(); Task toggleTask = new ToggleAutoStartTask(autoStart, enableAutoStart); - toggleTask.setOnFailed(evt -> autoStartCheckbox.setSelected(!enableAutoStart)); // restore previous state + toggleTask.setOnFailed(event -> { + autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state + LOG.error("Failed to toggle autostart.", event.getSource().getException()); + }); executor.execute(toggleTask); }); }