Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit a54e6c4

Browse files
committed
Use the correct logger.
Better path handling.
1 parent 3bbbc42 commit a54e6c4

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

EssentialsPlugin/Utility/Backup.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,18 @@
55

66
namespace EssentialsPlugin.Utility
77
{
8-
using NLog;
9-
108
static class Backup
119
{
12-
private static readonly Logger Log = LogManager.GetLogger( "PluginLog" );
1310
static public void Create(string baseDirectory, bool createSubDirectories, bool backupAsteroids, bool backupSettings = false)
1411
{
15-
Log.Info( "Creating backup ..." );
12+
Essentials.Log.Info( "Creating backup ..." );
1613
//string baseDirectory = PluginSettings.Instance.BackupBaseDirectory;
1714
if (!Directory.Exists(baseDirectory))
1815
{
1916
Directory.CreateDirectory(baseDirectory);
2017
}
2118

22-
var savePath = Server.Instance.Config.LoadWorld;
19+
string savePath = Server.Instance.Config.LoadWorld;
2320

2421
string finalDirectory = baseDirectory;
2522
//if (PluginSettings.Instance.BackupCreateSubDirectories)
@@ -36,7 +33,7 @@ static public void Create(string baseDirectory, bool createSubDirectories, bool
3633
if (!Directory.Exists(tempDirectory))
3734
Directory.CreateDirectory(tempDirectory);
3835

39-
File.Copy(savePath + "\\" + "SANDBOX_0_0_0_.sbs", tempDirectory + "\\" + "SANDBOX_0_0_0_.sbs", true);
36+
File.Copy(Path.Combine( savePath, "SANDBOX_0_0_0_.sbs" ), Path.Combine( tempDirectory, "SANDBOX_0_0_0_.sbs" ), true);
4037
File.Copy(savePath + "\\" + "Sandbox.sbc", tempDirectory + "\\" + "Sandbox.sbc", true);
4138

4239
//if (PluginSettings.Instance.BackupAsteroids)
@@ -74,7 +71,7 @@ static public void Create(string baseDirectory, bool createSubDirectories, bool
7471
File.Delete(file);
7572
}
7673

77-
Log.Info(string.Format("Backup created: {0}", finalDirectory + "\\" + string.Format("Backup-{0}", DateTime.Now.ToString("d-M-yyyy-hh-mm")) + ".zip"));
74+
Essentials.Log.Info( "Backup created: {0}\\" + "Backup-{1}.zip", finalDirectory, DateTime.Now.ToString( "d-M-yyyy-hh-mm" ) );
7875
}
7976
}
8077
}

0 commit comments

Comments
 (0)