Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix disposed exception on shutdown #350

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Fix disposed exception on shutdown #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Moryx.Runtime.Kernel/KernelServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,24 +87,27 @@ public static IConfigManager UseMoryxConfigurations(this IServiceProvider servic
return configManager;
}

private static IModuleManager _moduleManager;
/// <summary>
/// Boot system and start all modules
/// </summary>
/// <param name="serviceProvider"></param>
/// <returns></returns>
[Obsolete("Resolve IModuleManager and call StartModules directly")]
public static IModuleManager StartMoryxModules(this IServiceProvider serviceProvider)
{
var moduleManager = serviceProvider.GetRequiredService<IModuleManager>();
moduleManager.StartModules();
return moduleManager;
return _moduleManager = moduleManager;
}

/// <summary>
/// Stop all modules
/// </summary>
[Obsolete("Stopping modules on service collection causes an exception, call StopModules on the return value of StartModules")]
public static IModuleManager StopMoryxModules(this IServiceProvider serviceProvider)
{
var moduleManager = serviceProvider.GetRequiredService<IModuleManager>();
var moduleManager = _moduleManager ?? serviceProvider.GetRequiredService<IModuleManager>();
moduleManager.StopModules();
return moduleManager;
}
Expand Down
8 changes: 6 additions & 2 deletions src/StartProject.Asp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
using Moryx.Tools;
using Moryx.Model;
using Moryx.Runtime.Endpoints;
using Microsoft.Extensions.DependencyInjection;
using Moryx.Runtime.Modules;

namespace StartProject.Asp
{
Expand All @@ -26,11 +28,13 @@ public static void Main(string[] args)
}).Build();

host.Services.UseMoryxConfigurations("Config");
host.Services.StartMoryxModules();

var moduleManager = host.Services.GetRequiredService<IModuleManager>();
moduleManager.StartModules();

host.Run();

host.Services.StopMoryxModules();
moduleManager.StopModules();
}
}
}
14 changes: 2 additions & 12 deletions src/Tests/Moryx.Runtime.Kernel.Tests/KernelServiceCollectionExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ public void SetupConfigurationToBeUsed()
}

[Test]
public void StartAllModules()
public void StartAndStopAllModules()
{
// Arrange
var moduleManagerMock = new Mock<IModuleManager>();
_serviceCollection.AddSingleton<IModuleManager>(moduleManagerMock.Object);
_serviceCollection.AddSingleton(moduleManagerMock.Object);
var provider = _serviceCollection.BuildServiceProvider();

// Act
Expand All @@ -98,22 +98,12 @@ public void StartAllModules()
// Assert
moduleManagerMock.Verify(m => m.StartModules(), Times.Once);
moduleManagerMock.VerifyNoOtherCalls();
}

[Test]
public void StopAllModules()
{
// Arrange
var moduleManagerMock = new Mock<IModuleManager>();
_serviceCollection.AddSingleton<IModuleManager>(moduleManagerMock.Object);
var provider = _serviceCollection.BuildServiceProvider();

// Act
provider.StopMoryxModules();

// Assert
moduleManagerMock.Verify(m => m.StopModules(), Times.Once);
moduleManagerMock.VerifyNoOtherCalls();
}
}
}