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

Fixed initial install console and added a better redirect handling when creating a server

Browse Source
This commit is contained in:
Marcel Baumgartner
2023-08-27 20:40:58 +02:00
parent bada1e829b
commit b9c094cafa
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Moonlight/App/Helpers/Wings/WingsConsole.cs
View File

@@ -218,6 +218,16 @@ public class WingsConsole : IDisposable
break; break;
case "install output": case "install output":
if (ServerState != ServerState.Installing)
{
// Because wings is sending "install output" events BEFORE
// sending the "install started" event,
// we need to set the install state here
// See https://github.com/pterodactyl/panel/issues/4853
// for more details
await UpdateServerState(ServerState.Installing);
}
foreach (var line in eventData.Args) foreach (var line in eventData.Args)
{ {
await SaveMessage(line); await SaveMessage(line);

4
Moonlight/Shared/Views/Admin/Servers/New.razor
View File

@@ -229,7 +229,7 @@
{ {
try try
{ {
await ServerService.Create(Model.Name, Model.Cpu, Model.Memory, Model.Disk, Model.Owner, Model.Image, Model.Node, server => var newServer = await ServerService.Create(Model.Name, Model.Cpu, Model.Memory, Model.Disk, Model.Owner, Model.Image, Model.Node, server =>
{ {
server.OverrideStartup = Model.OverrideStartup; server.OverrideStartup = Model.OverrideStartup;
server.DockerImageIndex = Model.DockerImageIndex; server.DockerImageIndex = Model.DockerImageIndex;
@@ -242,7 +242,7 @@
}); });
await ToastService.Success(SmartTranslateService.Translate("Server successfully created")); await ToastService.Success(SmartTranslateService.Translate("Server successfully created"));
NavigationManager.NavigateTo("/admin/servers"); NavigationManager.NavigateTo($"/server/{newServer.Uuid}");
} }
catch (DisplayException e) catch (DisplayException e)
{ {