diff --git a/src/main/java/net/szum123321/textile_backup/core/Cleanup.java b/src/main/java/net/szum123321/textile_backup/core/Cleanup.java index 83cc3eb..bb80c89 100644 --- a/src/main/java/net/szum123321/textile_backup/core/Cleanup.java +++ b/src/main/java/net/szum123321/textile_backup/core/Cleanup.java @@ -50,7 +50,7 @@ public class Cleanup { final long now = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC); deletedFiles += RestoreableFile.applyOnFiles(root, 0L, - e -> log.error("An exception occurred while trying to delete an old files!", e), + e -> log.error("An exception occurred while trying to delete old files!", e), stream -> stream.filter(f -> now - f.getCreationTime().toEpochSecond(ZoneOffset.UTC) > config.get().maxAge) .filter(f -> deleteFile(f.getFile(), ctx)) .count() diff --git a/src/main/java/net/szum123321/textile_backup/core/create/BackupScheduler.java b/src/main/java/net/szum123321/textile_backup/core/create/BackupScheduler.java index c4d7e1b..82d8bbe 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/BackupScheduler.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/BackupScheduler.java @@ -27,12 +27,13 @@ import java.time.Instant; /** * Runs backup on a preset interval - *
+ *

* The important thing to note:
- * In the case that doBackupsOnEmptyServer == false and there have been made backups with players online, - * then everyone left the backup that was scheduled with player is still going to run. So it might appear as though there - * has been made backup with no players online despite the config. This is the expected behaviour - *
+ * The decision of whether to do a backup or not is made at the time of scheduling, that is, whenever the nextBackup + * flag is set. This means that even if doBackupsOnEmptyServer=false, the backup that was scheduled with players online will + * still go thorough.
+ * It might appear as though there has been made a backup with no players online despite the config. This is the expected behaviour + *

* Furthermore, it uses system time */ public class BackupScheduler { @@ -73,7 +74,7 @@ public class BackupScheduler { } else if(!config.get().doBackupsOnEmptyServer && server.getPlayerManager().getCurrentPlayerCount() == 0) { //Do the final backup. No one's on-line and doBackupsOnEmptyServer == false if(scheduled && nextBackup <= now) { - //Verify we hadn't done the final one and its time to do so + //Verify we hadn't done the final one, and it's time to do so Globals.INSTANCE.getQueueExecutor().submit( MakeBackupRunnableFactory.create( BackupContext.Builder diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java index 5102e52..de1fa44 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java @@ -41,7 +41,7 @@ public class RestoreHelper { Optional optionalFile = RestoreableFile.applyOnFiles(root, Optional.empty(), - e -> log.error("An error occurred while trying to lock file!", e), + e -> log.error("An exception occurred while trying to lock the file!", e), s -> s.filter(rf -> rf.getCreationTime().equals(backupTime)) .findFirst());