minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-23 06:45:04 +02:00
Code Issues Releases Wiki Activity

Cleanup of Backup class

Browse Source
This commit is contained in:
snowleo
2012-01-04 05:45:21 +01:00
parent d2bbbd14fc
commit 86ea654a5d
1 changed files with 77 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
Essentials/src/com/earth2me/essentials/Backup.java
View File

@@ -35,7 +35,8 @@ public class Backup implements Runnable, IBackup
} }
} }
public void startTask() @Override
public final void startTask()
{ {
if (running.compareAndSet(false, true)) if (running.compareAndSet(false, true))
{ {
@@ -63,78 +64,90 @@ public class Backup implements Runnable, IBackup
final ISettings settings = ess.getSettings(); final ISettings settings = ess.getSettings();
settings.acquireReadLock(); settings.acquireReadLock();
final String command = settings.getData().getGeneral().getBackup().getCommand(); final String command = settings.getData().getGeneral().getBackup().getCommand();
if (command == null || "".equals(command)) if (command == null || command.isEmpty())
{ {
return; return;
} }
LOGGER.log(Level.INFO, _("backupStarted")); LOGGER.log(Level.INFO, _("backupStarted"));
final CommandSender cs = server.getConsoleSender(); final CommandSender consoleSender = server.getConsoleSender();
server.dispatchCommand(cs, "save-all"); server.dispatchCommand(consoleSender, "save-all");
server.dispatchCommand(cs, "save-off"); server.dispatchCommand(consoleSender, "save-off");
ess.scheduleAsyncDelayedTask( ess.scheduleAsyncDelayedTask(new BackupRunner(command));
new Runnable() }
private class BackupRunner implements Runnable
{
private final transient String command;
public BackupRunner(final String command)
{
this.command = command;
}
@Override
public void run()
{
try
{
final ProcessBuilder childBuilder = new ProcessBuilder(command);
childBuilder.redirectErrorStream(true);
childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
final Process child = childBuilder.start();
final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
try
{ {
@Override child.waitFor();
public void run() String line;
do
{ {
try line = reader.readLine();
if (line != null)
{ {
final ProcessBuilder childBuilder = new ProcessBuilder(command); LOGGER.log(Level.INFO, line);
childBuilder.redirectErrorStream(true);
childBuilder.directory(ess.getDataFolder().getParentFile().getParentFile());
final Process child = childBuilder.start();
final BufferedReader reader = new BufferedReader(new InputStreamReader(child.getInputStream()));
try
{
child.waitFor();
String line;
do
{
line = reader.readLine();
if (line != null)
{
LOGGER.log(Level.INFO, line);
}
}
while (line != null);
}
finally
{
reader.close();
}
}
catch (InterruptedException ex)
{
LOGGER.log(Level.SEVERE, null, ex);
}
catch (IOException ex)
{
LOGGER.log(Level.SEVERE, null, ex);
}
finally
{
ess.scheduleSyncDelayedTask(
new Runnable()
{
@Override
public void run()
{
server.dispatchCommand(cs, "save-on");
if (server.getOnlinePlayers().length == 0)
{
running.set(false);
if (taskId != -1)
{
server.getScheduler().cancelTask(taskId);
}
}
active.set(false);
LOGGER.log(Level.INFO, _("backupFinished"));
}
});
} }
} }
}); while (line != null);
}
finally
{
reader.close();
}
}
catch (InterruptedException ex)
{
LOGGER.log(Level.SEVERE, null, ex);
}
catch (IOException ex)
{
LOGGER.log(Level.SEVERE, null, ex);
}
finally
{
ess.scheduleSyncDelayedTask(new EnableSavingRunner());
}
}
}
private class EnableSavingRunner implements Runnable
{
@Override
public void run()
{
server.dispatchCommand(server.getConsoleSender(), "save-on");
if (server.getOnlinePlayers().length == 0)
{
running.set(false);
if (taskId != -1)
{
server.getScheduler().cancelTask(taskId);
}
}
active.set(false);
LOGGER.log(Level.INFO, _("backupFinished"));
}
} }
} }