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

Use Factory.GetInstance in Current

Browse Source
This commit is contained in:
Mole
2020-09-21 15:12:14 +02:00
parent 5c9a681566
commit 3be396f384
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Composing/Current.cs
View File

@@ -14,7 +14,7 @@ namespace Umbraco.Composing
{
public static class Current
{
private static Microsoft.Extensions.Logging.ILogger<object> _logger = new NullLogger<object>();
private static ILogger<object> _logger = new NullLogger<object>();
private static ILoggerFactory _loggerFactory;
private static IIOHelper _ioHelper;
private static IHostingEnvironment _hostingEnvironment;
@@ -23,7 +23,7 @@ namespace Umbraco.Composing
private static SecuritySettings _securitySettings;
private static GlobalSettings _globalSettings;
public static Microsoft.Extensions.Logging.ILogger<object> Logger => EnsureInitialized(_logger);
public static ILogger<object> Logger => EnsureInitialized(_logger);
public static IIOHelper IOHelper => EnsureInitialized(_ioHelper);
public static IHostingEnvironment HostingEnvironment => EnsureInitialized(_hostingEnvironment);
public static IBackOfficeInfo BackOfficeInfo => EnsureInitialized(_backOfficeInfo);
@@ -44,7 +44,7 @@ namespace Umbraco.Composing
}
public static void Initialize(
Microsoft.Extensions.Logging.ILogger<object> logger,
ILogger<object> logger,
SecuritySettings securitySettings,
GlobalSettings globalSettings,
IIOHelper ioHelper,

5
src/Umbraco.Web/Composing/Current.cs
View File

@@ -244,9 +244,10 @@ namespace Umbraco.Web.Composing
public static IShortStringHelper ShortStringHelper => Factory.GetInstance<IShortStringHelper>();
public static Microsoft.Extensions.Logging.ILogger<object> Logger => Umbraco.Composing.Current.Logger;
// TODO: Use LoggerFactory instead of shared Logger
public static ILogger<object> Logger => Factory.GetInstance<ILogger<object>>();
public static ILoggerFactory LoggerFactory => Umbraco.Composing.Current.LoggerFactory;
public static ILoggerFactory LoggerFactory => Factory.GetInstance<ILoggerFactory>();
public static IProfiler Profiler => Factory.GetInstance<IProfiler>();