Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #198 from Moonlight-Panel/FixServerDelete

Browse Source 
Fixed server delete
This commit is contained in:
Marcel Baumgartner
2023-06-26 22:51:17 +02:00
committed by GitHub
parent fe1f4412d8 d60f8fc905
commit ab9333f99a
1 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Moonlight/App/Services/ServerService.cs
View File

@@ -85,12 +85,12 @@ public class ServerService
.Times(3) .Times(3)
.At(x => x.Message.Contains("A task was canceled")) .At(x => x.Message.Contains("A task was canceled"))
.Call(async () => .Call(async () =>
{ {
result = await WingsApiHelper.Get<ServerDetails>( result = await WingsApiHelper.Get<ServerDetails>(
server.Node, server.Node,
$"api/servers/{server.Uuid}" $"api/servers/{server.Uuid}"
); );
}); });
return result; return result;
} }
@@ -119,7 +119,8 @@ public class ServerService
var backup = new ServerBackup() var backup = new ServerBackup()
{ {
Name = $"Created at {DateTimeService.GetCurrent().ToShortDateString()} {DateTimeService.GetCurrent().ToShortTimeString()}", Name =
$"Created at {DateTimeService.GetCurrent().ToShortDateString()} {DateTimeService.GetCurrent().ToShortTimeString()}",
Uuid = Guid.NewGuid(), Uuid = Guid.NewGuid(),
CreatedAt = DateTimeService.GetCurrent(), CreatedAt = DateTimeService.GetCurrent(),
Created = false Created = false
@@ -185,8 +186,15 @@ public class ServerService
try try
{ {
await WingsApiHelper.Delete(serverData.Node, $"api/servers/{serverData.Uuid}/backup/{serverBackup.Uuid}", await new Retry()
null); .Times(3)
.At(x => x.Message.Contains("A task was canceled"))
.Call(async () =>
{
await WingsApiHelper.Delete(serverData.Node,
$"api/servers/{serverData.Uuid}/backup/{serverBackup.Uuid}",
null);
});
} }
catch (WingsException e) catch (WingsException e)
{ {
@@ -197,7 +205,7 @@ public class ServerService
throw; throw;
} }
} }
var backup = serverData.Backups.First(x => x.Uuid == serverBackup.Uuid); var backup = serverData.Backups.First(x => x.Uuid == serverBackup.Uuid);
serverData.Backups.Remove(backup); serverData.Backups.Remove(backup);
@@ -264,10 +272,11 @@ public class ServerService
{ {
// We have sadly no choice to use entity framework to do what the sql call does, there // We have sadly no choice to use entity framework to do what the sql call does, there
// are only slower ways, so we will use a raw sql call as a exception // are only slower ways, so we will use a raw sql call as a exception
freeAllocations = NodeAllocationRepository freeAllocations = NodeAllocationRepository
.Get() .Get()
.FromSqlRaw($"SELECT * FROM `NodeAllocations` WHERE ServerId IS NULL AND NodeId={node.Id} LIMIT {allocations}") .FromSqlRaw(
$"SELECT * FROM `NodeAllocations` WHERE ServerId IS NULL AND NodeId={node.Id} LIMIT {allocations}")
.ToArray(); .ToArray();
} }
catch (Exception) catch (Exception)
@@ -328,7 +337,7 @@ public class ServerService
}); });
//TODO: AuditLog //TODO: AuditLog
return newServerData; return newServerData;
} }
catch (Exception e) catch (Exception e)
@@ -350,7 +359,7 @@ public class ServerService
server.Installing = true; server.Installing = true;
ServerRepository.Update(server); ServerRepository.Update(server);
//TODO: AuditLog //TODO: AuditLog
} }
@@ -386,8 +395,6 @@ public class ServerService
public async Task Delete(Server s) public async Task Delete(Server s)
{ {
throw new DisplayException("Deleting servers is currently disabled");
var backups = await GetBackups(s); var backups = await GetBackups(s);
foreach (var backup in backups) foreach (var backup in backups)
@@ -408,7 +415,21 @@ public class ServerService
.Include(x => x.Node) .Include(x => x.Node)
.First(x => x.Id == s.Id); .First(x => x.Id == s.Id);
await WingsApiHelper.Delete(server.Node, $"api/servers/{server.Uuid}", null); try
{
await new Retry()
.Times(3)
.At(x => x.Message.Contains("A task was canceled"))
.Call(async () =>
{
await WingsApiHelper.Delete(server.Node, $"api/servers/{server.Uuid}", null);
});
}
catch (WingsException e)
{
if (e.StatusCode != 404)
throw;
}
foreach (var variable in server.Variables.ToArray()) foreach (var variable in server.Variables.ToArray())
{ {
@@ -435,19 +456,19 @@ public class ServerService
{ {
if (server.IsArchived) if (server.IsArchived)
throw new DisplayException("Unable to archive an already archived server"); throw new DisplayException("Unable to archive an already archived server");
// Archive server // Archive server
var backup = await CreateBackup(server); var backup = await CreateBackup(server);
server.IsArchived = true; server.IsArchived = true;
server.Archive = backup; server.Archive = backup;
ServerRepository.Update(server); ServerRepository.Update(server);
await Event.WaitForEvent<ServerBackup>("wings.backups.create", this, x => backup.Id == x.Id); await Event.WaitForEvent<ServerBackup>("wings.backups.create", this, x => backup.Id == x.Id);
// Reset server // Reset server
var access = await CreateFileAccess(server, null!); var access = await CreateFileAccess(server, null!);
var files = await access.Ls(); var files = await access.Ls();
foreach (var file in files) foreach (var file in files)
@@ -461,7 +482,7 @@ public class ServerService
// ignored // ignored
} }
} }
await Event.Emit($"server.{server.Uuid}.archiveStatusChanged", server); await Event.Emit($"server.{server.Uuid}.archiveStatusChanged", server);
} }
@@ -483,7 +504,7 @@ public class ServerService
await RestoreBackup(server, server.Archive); await RestoreBackup(server, server.Archive);
await Event.WaitForEvent<ServerBackup>("wings.backups.restore", this, await Event.WaitForEvent<ServerBackup>("wings.backups.restore", this,
x => x.Id == server.Archive.Id); x => x.Id == server.Archive.Id);
server.IsArchived = false; server.IsArchived = false;