summaryrefslogtreecommitdiff
path: root/src/main/java/com/keuin/kbackupfabric/operation/backup
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/keuin/kbackupfabric/operation/backup')
-rw-r--r--src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java20
-rw-r--r--src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java4
2 files changed, 21 insertions, 3 deletions
diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java
index bdd6d88..696ee02 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/IncrementalBackupFeedback.java
@@ -3,13 +3,31 @@ package com.keuin.kbackupfabric.operation.backup.feedback;
import com.keuin.kbackupfabric.backup.incremental.manager.IncCopyResult;
import org.jetbrains.annotations.Nullable;
+import java.util.Objects;
+
public class IncrementalBackupFeedback implements BackupFeedback {
private final boolean success;
private final IncCopyResult copyResult;
+ // if the backup failed because of an exception, set this.
+ // Otherwise, this should be null.
+ private final Throwable throwable;
public IncrementalBackupFeedback(boolean success, @Nullable IncCopyResult copyResult) {
this.success = success;
this.copyResult = copyResult;
+ this.throwable = null;
+ }
+
+ /**
+ * Create a failed backup feedback caused by an exception.
+ *
+ * @param t the exception.
+ */
+ public IncrementalBackupFeedback(Throwable t) {
+ Objects.requireNonNull(t);
+ this.success = false;
+ this.copyResult = null;
+ this.throwable = t;
}
@Override
@@ -26,6 +44,6 @@ public class IncrementalBackupFeedback implements BackupFeedback {
if (success && copyResult != null)
return copyResult.toString();
else
- return "Backup failed.";
+ return (throwable == null) ? "No further information." : (throwable.getLocalizedMessage());
}
}
diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
index 0c202e1..2cc0765 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
@@ -99,8 +99,8 @@ public class ConfiguredIncrementalBackupMethod implements ConfiguredBackupMethod
PrintUtil.info("Incremental backup finished.");
feedback = new IncrementalBackupFeedback(true, copyResult);
} catch (IOException e) {
- e.printStackTrace(); // at least we should print it out if we discard the exception... Better than doing nothing.
- feedback = new IncrementalBackupFeedback(false, null);
+// e.printStackTrace(); // stack trace has been passed to backup feedback. No need to print here.
+ feedback = new IncrementalBackupFeedback(e);
}
// do clean-up if failed