dugulp
/
textile_backup_chinese
mirror of https://github.com/dugulingping/textile_backup_chinese.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added more accurate detection of insufficient /tmp

2.x-1.17
Szum123321 2021-11-27 19:58:51 +01:00
parent eb6f4fdb10
commit 50e465fc17
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/szum123321/textile_backup/Statics.java
View File

@ -36,4 +36,5 @@ public class Statics {
public static boolean disableWatchdog = false;
public static AwaitThread restoreAwaitThread = null;
public static Optional<File> untouchableFile = Optional.empty();
public static boolean disableTMPFiles = false;
}

7
src/main/java/net/szum123321/textile_backup/TextileBackup.java
View File

@ -38,6 +38,7 @@ import net.szum123321.textile_backup.commands.restore.RestoreBackupCommand;
import net.szum123321.textile_backup.config.ConfigHelper;
import net.szum123321.textile_backup.config.ConfigPOJO;
import net.szum123321.textile_backup.core.ActionInitiator;
import net.szum123321.textile_backup.core.Utilities;
import net.szum123321.textile_backup.core.create.BackupContext;
import net.szum123321.textile_backup.core.create.BackupHelper;
import net.szum123321.textile_backup.core.create.BackupScheduler;
@ -59,9 +60,11 @@ public class TextileBackup implements ModInitializer {
ServerTickEvents.END_SERVER_TICK.register(new BackupScheduler()::tick);
//Restart Executor Service in singleplayer
ServerLifecycleEvents.SERVER_STARTING.register(ignored -> {
//Restart Executor Service in single-player
ServerLifecycleEvents.SERVER_STARTING.register(server -> {
if(Statics.executorService.isShutdown()) Statics.executorService = Executors.newSingleThreadExecutor();
Utilities.updateTMPFSFlag(server);
});
ServerLifecycleEvents.SERVER_STOPPED.register(server -> {

9
src/main/java/net/szum123321/textile_backup/core/Utilities.java
View File

@ -80,6 +80,15 @@ public class Utilities {
return path;
}
public static boolean updateTMPFSFlag(MinecraftServer server) {
Statics.disableTMPFiles = (FileUtils.sizeOfDirectory(Utilities.getWorldFolder(server)) >=
(new File(System.getProperty("java.io.tmpdir"))).getFreeSpace());
if(Statics.disableTMPFiles) log.warn("Not enough space left in tmp directory!\n Might cause: https://github.com/Szum123321/textile_backup/wiki/ZIP-Problems");
return Statics.disableTMPFiles;
}
public static void disableWorldSaving(MinecraftServer server) {
for (ServerWorld serverWorld : server.getWorlds()) {
if (serverWorld != null && !serverWorld.savingDisabled)

2
src/main/java/net/szum123321/textile_backup/core/create/MakeBackupRunnable.java
View File

@ -92,7 +92,7 @@ public class MakeBackupRunnable implements Runnable {
switch (config.get().format) {
case ZIP -> {
if (coreCount > 1)
if (coreCount > 1 && !Statics.disableTMPFiles)
ParallelZipCompressor.getInstance().createArchive(world, outFile, context, coreCount);
else
ZipCompressor.getInstance().createArchive(world, outFile, context, coreCount);