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

Use LoggerFactory in UmbracoController instead of global ILogger

Browse Source
This commit is contained in:
Mole
2020-09-21 08:29:44 +02:00
parent 30d4233565
commit 8ff33e3cd0
5 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
View File

@@ -161,7 +161,7 @@ namespace Umbraco.Tests.Routing
Factory.GetInstance<ServiceContext>(),
Factory.GetInstance<AppCaches>(),
Factory.GetInstance<IProfilingLogger>(),
Factory.GetInstance<Umbraco.Core.Logging.ILogger<CustomDocumentController>>());
Factory.GetInstance<ILoggerFactory>());
}), ShortStringHelper);
handler.GetHandlerForRoute(httpContext.Request.RequestContext, frequest);
@@ -198,8 +198,8 @@ namespace Umbraco.Tests.Routing
/// </summary>
public class CustomDocumentController : RenderMvcController
{
public CustomDocumentController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, Umbraco.Core.Logging.ILogger<CustomDocumentController> logger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
public CustomDocumentController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILoggerFactory loggerFactory)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, loggerFactory)
{
}

11
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -5,6 +5,7 @@ using System.Web;
using System.Web.Mvc;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Logging;
using Microsoft.Owin.Security;
using Umbraco.Core;
using Umbraco.Core.Cache;
@@ -37,6 +38,7 @@ namespace Umbraco.Web.Editors
private readonly IHostingEnvironment _hostingEnvironment;
private readonly RuntimeSettings _runtimeSettings;
private readonly SecuritySettings _securitySettings;
private readonly Microsoft.Extensions.Logging.ILogger<BackOfficeController> _logger;
public BackOfficeController(
UmbracoFeatures features,
@@ -45,13 +47,13 @@ namespace Umbraco.Web.Editors
ServiceContext services,
AppCaches appCaches,
IProfilingLogger profilingLogger,
ILogger<BackOfficeController> logger,
ILoggerFactory loggerFactory,
IUmbracoVersion umbracoVersion,
IOptions<ContentSettings> contentSettings,
IHostingEnvironment hostingEnvironment,
IOptions<RuntimeSettings> settings,
IOptions<SecuritySettings> securitySettings)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, loggerFactory)
{
_features = features;
@@ -60,6 +62,7 @@ namespace Umbraco.Web.Editors
_hostingEnvironment = hostingEnvironment;
_runtimeSettings = settings.Value;
_securitySettings = securitySettings.Value;
_logger = loggerFactory.CreateLogger<BackOfficeController>();
}
protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -177,7 +180,7 @@ namespace Umbraco.Web.Editors
var authType = OwinContext.Authentication.GetExternalAuthenticationTypes().FirstOrDefault(x => x.AuthenticationType == loginInfo.Login.LoginProvider);
if (authType == null)
{
Logger.LogWarning("Could not find external authentication provider registered: {LoginProvider}", loginInfo.Login.LoginProvider);
_logger.LogWarning("Could not find external authentication provider registered: {LoginProvider}", loginInfo.Login.LoginProvider);
}
else
{
@@ -200,7 +203,7 @@ namespace Umbraco.Web.Editors
shouldSignIn = autoLinkOptions.OnExternalLogin(user, loginInfo);
if (shouldSignIn == false)
{
Logger.LogWarning("The AutoLinkOptions of the external authentication provider '{LoginProvider}' have refused the login based on the OnExternalLogin method. Affected user id: '{UserId}'", loginInfo.Login.LoginProvider, user.Id);
_logger.LogWarning("The AutoLinkOptions of the external authentication provider '{LoginProvider}' have refused the login based on the OnExternalLogin method. Affected user id: '{UserId}'", loginInfo.Login.LoginProvider, user.Id);
}
}

9
src/Umbraco.Web/Mvc/RenderMvcController.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Web.Mvc;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Logging;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
@@ -21,16 +22,18 @@ namespace Umbraco.Web.Mvc
public class RenderMvcController : UmbracoController, IRenderMvcController
{
private IPublishedRequest _publishedRequest;
private readonly Microsoft.Extensions.Logging.ILogger<RenderMvcController> _logger;
public RenderMvcController()
{
ActionInvoker = new RenderActionInvoker();
}
public RenderMvcController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILogger<RenderMvcController> logger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
public RenderMvcController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILoggerFactory loggerFactory)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, loggerFactory)
{
ActionInvoker = new RenderActionInvoker();
_logger = loggerFactory.CreateLogger<RenderMvcController>();
}
/// <summary>
@@ -70,7 +73,7 @@ namespace Umbraco.Web.Mvc
var result = ViewEngines.Engines.FindView(ControllerContext, template, null);
if (result.View != null) return true;
Logger.LogWarning("No physical template file was found for template {Template}", template);
_logger.LogWarning("No physical template file was found for template {Template}", template);
return false;
}

5
src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Logging;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
@@ -23,8 +24,8 @@ namespace Umbraco.Web.Mvc
{
}
protected UmbracoAuthorizedController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILogger<UmbracoAuthorizedController> logger)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, logger)
protected UmbracoAuthorizedController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILoggerFactory loggerFactory)
: base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, loggerFactory)
{
}
}

16
src/Umbraco.Web/Mvc/UmbracoController.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Web;
using System.Web.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.Owin;
using Umbraco.Core.Cache;
@@ -47,16 +48,17 @@ namespace Umbraco.Web.Mvc
/// </summary>
public AppCaches AppCaches { get; }
/// <summary>
/// Gets or sets the logger.
/// </summary>
public ILogger<UmbracoController> Logger { get; }
/// <summary>
/// Gets or sets the profiling logger.
/// </summary>
public IProfilingLogger ProfilingLogger { get; set; }
/// <summary>
/// Gets the LoggerFactory
/// </summary>
public ILoggerFactory LoggerFactory { get; }
protected IOwinContext OwinContext => Request.GetOwinContext();
/// <summary>
@@ -76,19 +78,19 @@ namespace Umbraco.Web.Mvc
Current.Factory.GetInstance<ServiceContext>(),
Current.Factory.GetInstance<AppCaches>(),
Current.Factory.GetInstance<IProfilingLogger>(),
Current.Factory.GetInstance<ILogger<UmbracoController>>()
Current.Factory.GetInstance<LoggerFactory>()
)
{
}
protected UmbracoController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILogger<UmbracoController> logger)
protected UmbracoController(IOptions<GlobalSettings> globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, ILoggerFactory loggerFactory)
{
GlobalSettings = globalSettings;
UmbracoContextAccessor = umbracoContextAccessor;
Services = services;
AppCaches = appCaches;
Logger = logger;
ProfilingLogger = profilingLogger;
LoggerFactory = loggerFactory;
}
}
}