This commit is contained in:
Cyberboss
2017-09-07 23:09:46 -04:00
parent af6a3856ac
commit fd7ef917f9
2 changed files with 22 additions and 22 deletions
+19 -19
View File
@@ -132,11 +132,11 @@ namespace TGServerService
//we need to remove symlinks before we can recursively delete
void CleanGameFolder()
{
if (Directory.Exists(GameDirA + InterfaceDLLName))
Directory.Delete(GameDirA + InterfaceDLLName);
{
if (Directory.Exists(GameDirA + InterfaceDLLName))
Directory.Delete(GameDirA + InterfaceDLLName);
if (Directory.Exists(GameDirA + LibMySQLFile))
if (Directory.Exists(GameDirA + LibMySQLFile))
Directory.Delete(GameDirA + LibMySQLFile);
if (Directory.Exists(GameDirA + "/data"))
@@ -145,13 +145,13 @@ namespace TGServerService
if (Directory.Exists(GameDirA + "/config"))
Directory.Delete(GameDirA + "/config");
if (Directory.Exists(GameDirB + InterfaceDLLName))
Directory.Delete(GameDirB + InterfaceDLLName);
if (Directory.Exists(GameDirB + InterfaceDLLName))
Directory.Delete(GameDirB + InterfaceDLLName);
if (Directory.Exists(GameDirB + LibMySQLFile))
Directory.Delete(GameDirB + LibMySQLFile);
if (Directory.Exists(GameDirB + LibMySQLFile))
Directory.Delete(GameDirB + LibMySQLFile);
if (Directory.Exists(GameDirB + "/data"))
if (Directory.Exists(GameDirB + "/data"))
Directory.Delete(GameDirB + "/data");
if (Directory.Exists(GameDirB + "/config"))
@@ -200,13 +200,13 @@ namespace TGServerService
CreateSymlink(GameDirA + "/config", StaticConfigDir);
CreateSymlink(GameDirB + "/config", StaticConfigDir);
CreateSymlink(GameDirA + LibMySQLFile, StaticDirs + LibMySQLFile);
CreateSymlink(GameDirB + LibMySQLFile, StaticDirs + LibMySQLFile);
CreateSymlink(GameDirA + LibMySQLFile, StaticDirs + LibMySQLFile);
CreateSymlink(GameDirB + LibMySQLFile, StaticDirs + LibMySQLFile);
CreateSymlink(GameDirA + InterfaceDLLName, StaticDirs + InterfaceDLLName);
CreateSymlink(GameDirB + InterfaceDLLName, StaticDirs + InterfaceDLLName);
CreateSymlink(GameDirA + InterfaceDLLName, StaticDirs + InterfaceDLLName);
CreateSymlink(GameDirB + InterfaceDLLName, StaticDirs + InterfaceDLLName);
CreateSymlink(GameDirLive, GameDirA);
CreateSymlink(GameDirLive, GameDirA);
lock (CompilerLock)
{
@@ -324,12 +324,12 @@ namespace TGServerService
CreateSymlink(resurrectee + "/config", StaticConfigDir);
if (!Directory.Exists(resurrectee + "/data"))
CreateSymlink(resurrectee + "/data", StaticDataDir);
if (!File.Exists(resurrectee + LibMySQLFile))
CreateSymlink(resurrectee + LibMySQLFile, StaticDirs + LibMySQLFile);
if (!File.Exists(resurrectee + InterfaceDLLName))
CreateSymlink(resurrectee + InterfaceDLLName, StaticDirs + InterfaceDLLName);
if (!File.Exists(resurrectee + LibMySQLFile))
CreateSymlink(resurrectee + LibMySQLFile, StaticDirs + LibMySQLFile);
if (!File.Exists(resurrectee + InterfaceDLLName))
CreateSymlink(resurrectee + InterfaceDLLName, StaticDirs + InterfaceDLLName);
bool repobusy_check = false;
bool repobusy_check = false;
if (!Monitor.TryEnter(RepoLock))
repobusy_check = true;
+3 -3
View File
@@ -37,9 +37,9 @@ namespace TGServerService
//Only need 1 proc instance
void InitDreamDaemon()
{
UpdateInterfaceDll(false);
var Reattach = Properties.Settings.Default.ReattachToDD;
{
UpdateInterfaceDll(false);
var Reattach = Properties.Settings.Default.ReattachToDD;
if (Reattach)
try
{