yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Wrapping server messenger factory to avoid re-registering for now."

Browse Source 
This reverts commit 1198191e05.
This commit is contained in:
Lars-Erik Aabech
2018-10-24 21:06:52 +02:00
parent 026f10f38a
commit ccd3354b8a
2 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Umbraco.Core/Components/CompositionExtensions.cs
View File

@@ -172,23 +172,16 @@ namespace Umbraco.Core.Components
composition.Container.RegisterSingleton(_ => registrar);
}
// review since only one is called in the core for now, I remove this
// it allows us to wrap the factory to "allow re-registration".
///// <summary>
///// Sets the server messenger.
///// </summary>
///// <typeparam name="T">The type of the server registrar.</typeparam>
///// <param name="composition">The composition.</param>
//public static void SetServerMessenger<T>(this Composition composition)
// where T : IServerMessenger
//{
// composition.Container.Register<IServerMessenger, T>(Lifetime.Singleton);
//}
private static Func<IContainer, IServerMessenger> serverMessengerFactory = null;
private static bool serverMessengerIsRegistered = false;
private static Func<IContainer, IServerMessenger> wrappedServerMessengerFactory = c => serverMessengerFactory(c);
/// <summary>
/// Sets the server messenger.
/// </summary>
/// <typeparam name="T">The type of the server registrar.</typeparam>
/// <param name="composition">The composition.</param>
public static void SetServerMessenger<T>(this Composition composition)
where T : IServerMessenger
{
composition.Container.Register<IServerMessenger, T>(Lifetime.Singleton);
}
/// <summary>
/// Sets the server messenger.
@@ -197,13 +190,7 @@ namespace Umbraco.Core.Components
/// <param name="factory">A function creating a server messenger.</param>
public static void SetServerMessenger(this Composition composition, Func<IContainer, IServerMessenger> factory)
{
if (!serverMessengerIsRegistered)
{
serverMessengerIsRegistered = true;
composition.Container.RegisterSingleton(wrappedServerMessengerFactory);
}
serverMessengerFactory = factory;
composition.Container.RegisterSingleton(factory);
}
/// <summary>
@@ -213,13 +200,7 @@ namespace Umbraco.Core.Components
/// <param name="registrar">A server messenger.</param>
public static void SetServerMessenger(this Composition composition, IServerMessenger registrar)
{
if (!serverMessengerIsRegistered)
{
serverMessengerIsRegistered = true;
composition.Container.RegisterSingleton(wrappedServerMessengerFactory);
}
serverMessengerFactory = c => registrar;
composition.Container.RegisterSingleton(_ => registrar);
}
/// <summary>

3
src/Umbraco.Core/Runtime/CoreRuntimeComponent.cs
View File

@@ -74,8 +74,7 @@ namespace Umbraco.Core.Runtime
// by default we'll use the database server messenger with default options (no callbacks),
// this will be overridden by either the legacy thing or the db thing in the corresponding
// components in the web project - fixme - should obsolete the legacy thing
composition.SetServerMessenger(
factory
composition.Container.RegisterSingleton<IServerMessenger>(factory
=> new DatabaseServerMessenger(
factory.GetInstance<IRuntimeState>(),
factory.GetInstance<IScopeProvider>(),