1
0
mirror of https://github.com/chylex/Minecraft-Phantom-Panel.git synced 2024-11-25 16:42:54 +01:00

Compare commits

...

2 Commits

Author SHA1 Message Date
e40459a039
Unify enums used for result messages 2023-01-30 08:18:53 +01:00
4c66193b6e
Fix missing disposal of instances in the Agent 2023-01-29 21:14:26 +01:00
8 changed files with 24 additions and 13 deletions

View File

@ -33,6 +33,8 @@ public sealed class AgentServices {
Logger.Information("Stopping services..."); Logger.Information("Stopping services...");
await InstanceSessionManager.StopAll(); await InstanceSessionManager.StopAll();
InstanceSessionManager.Dispose();
await TaskManager.Stop(); await TaskManager.Stop();
Logger.Information("Services stopped."); Logger.Information("Services stopped.");

View File

@ -174,10 +174,10 @@ sealed class Instance : IDisposable {
} }
public void Dispose() { public void Dispose() {
stateTransitioningActionSemaphore.Dispose();
if (currentState is IDisposable disposable) { if (currentState is IDisposable disposable) {
disposable.Dispose(); disposable.Dispose();
} }
stateTransitioningActionSemaphore.Dispose();
} }
} }

View File

@ -138,15 +138,24 @@ sealed class InstanceSessionManager : IDisposable {
await semaphore.WaitAsync(CancellationToken.None); await semaphore.WaitAsync(CancellationToken.None);
try { try {
await Task.WhenAll(instances.Values.Select(static instance => instance.StopAndWait(TimeSpan.FromSeconds(30)))); await Task.WhenAll(instances.Values.Select(static instance => instance.StopAndWait(TimeSpan.FromSeconds(30))));
instances.Clear(); DisposeAllInstances();
} finally { } finally {
semaphore.Release(); semaphore.Release();
} }
} }
public void Dispose() { public void Dispose() {
DisposeAllInstances();
minecraftServerExecutables.Dispose(); minecraftServerExecutables.Dispose();
shutdownCancellationTokenSource.Dispose(); shutdownCancellationTokenSource.Dispose();
semaphore.Dispose(); semaphore.Dispose();
} }
private void DisposeAllInstances() {
foreach (var (_, instance) in instances) {
instance.Dispose();
}
instances.Clear();
}
} }

View File

@ -1,6 +1,6 @@
namespace Phantom.Common.Data.Instance; namespace Phantom.Common.Data.Instance;
public enum InstanceLaunchFailReason { public enum InstanceLaunchFailReason : byte {
UnknownError, UnknownError,
ServerPortNotAllowed, ServerPortNotAllowed,
ServerPortAlreadyInUse, ServerPortAlreadyInUse,

View File

@ -1,11 +1,11 @@
namespace Phantom.Common.Data.Replies; namespace Phantom.Common.Data.Replies;
public enum LaunchInstanceResult : byte { public enum LaunchInstanceResult : byte {
UnknownError,
LaunchInitiated, LaunchInitiated,
InstanceAlreadyLaunching, InstanceAlreadyLaunching,
InstanceAlreadyRunning, InstanceAlreadyRunning,
InstanceIsStopping, InstanceIsStopping
UnknownError
} }
public static class LaunchInstanceResultExtensions { public static class LaunchInstanceResultExtensions {

View File

@ -1,8 +1,8 @@
namespace Phantom.Common.Data.Replies; namespace Phantom.Common.Data.Replies;
public enum SendCommandToInstanceResult : byte { public enum SendCommandToInstanceResult : byte {
Success, UnknownError,
UnknownError Success
} }
public static class SendCommandToInstanceResultExtensions { public static class SendCommandToInstanceResultExtensions {

View File

@ -1,10 +1,10 @@
namespace Phantom.Common.Data.Replies; namespace Phantom.Common.Data.Replies;
public enum StopInstanceResult : byte { public enum StopInstanceResult : byte {
UnknownError,
StopInitiated, StopInitiated,
InstanceAlreadyStopping, InstanceAlreadyStopping,
InstanceAlreadyStopped, InstanceAlreadyStopped
UnknownError
} }
public static class StopInstanceResultExtensions { public static class StopInstanceResultExtensions {

View File

@ -1,14 +1,14 @@
namespace Phantom.Server.Services.Instances; namespace Phantom.Server.Services.Instances;
public enum AddInstanceResult { public enum AddInstanceResult : byte {
UnknownError,
Success, Success,
InstanceAlreadyExists, InstanceAlreadyExists,
InstanceNameMustNotBeEmpty, InstanceNameMustNotBeEmpty,
InstanceMemoryMustNotBeZero, InstanceMemoryMustNotBeZero,
AgentNotFound, AgentNotFound,
AgentInstanceLimitExceeded, AgentInstanceLimitExceeded,
AgentMemoryLimitExceeded, AgentMemoryLimitExceeded
UnknownError
} }
public static class AddInstanceResultExtensions { public static class AddInstanceResultExtensions {