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

Use loggerfactory with debug instead of DebugDiagnosticsLogger

Browse Source
This commit is contained in:
Nikolaj
2020-09-17 08:28:49 +02:00
parent 87774b789c
commit 9511c99ee7
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
View File

@@ -62,7 +62,7 @@ namespace Umbraco.Tests.Composing
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var logger = LoggerFactory.Create(builder => builder.AddDebug()).CreateLogger("ProfilingLogger");
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

4
src/Umbraco.Tests/Models/ContentTests.cs
View File

@@ -4,6 +4,7 @@ using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Threading;
using Microsoft.Extensions.Logging;
using Moq;
using Newtonsoft.Json;
using Umbraco.Core;
@@ -23,6 +24,7 @@ using Umbraco.Tests.TestHelpers.Stubs;
using Umbraco.Tests.Testing;
using Umbraco.Web.PropertyEditors;
using Umbraco.Tests.TestHelpers;
using ILogger = Umbraco.Core.Logging.ILogger;
namespace Umbraco.Tests.Models
{
@@ -237,7 +239,7 @@ namespace Umbraco.Tests.Models
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var logger = LoggerFactory.Create(builder => builder.AddDebug()).CreateLogger("ProfilingLogger");
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

11
src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
View File

@@ -86,11 +86,14 @@ namespace Umbraco.Tests.Runtimes
// test application
public class TestUmbracoApplication : UmbracoApplicationBase
{
public TestUmbracoApplication() : base(_logger, _configs, _ioHelper, _profiler, new AspNetHostingEnvironment(_hostingSettings), new AspNetBackOfficeInfo(_globalSettings, _ioHelper, _logger, _settings))
public TestUmbracoApplication() : base(_logger, _configs, _ioHelper, _profiler, new AspNetHostingEnvironment(_hostingSettings), new AspNetBackOfficeInfo(_globalSettings, _ioHelper, _loggerFactory.CreateLogger<AspNetBackOfficeInfo>(), _settings))
{
_loggerFactory = LoggerFactory.Create(builder => builder.AddDebug());
_logger = _loggerFactory.CreateLogger<TestUmbracoApplication>();
}
private static readonly DebugDiagnosticsLogger<object> _logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
private static ILoggerFactory _loggerFactory;
private static Microsoft.Extensions.Logging.ILogger<TestUmbracoApplication> _logger;
private static readonly IIOHelper _ioHelper = TestHelper.IOHelper;
private static readonly IProfiler _profiler = new TestProfiler();
private static readonly Configs _configs = GetConfigs();
@@ -110,7 +113,7 @@ namespace Umbraco.Tests.Runtimes
public IRuntime Runtime { get; private set; }
protected override IRuntime GetRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, ILoggerFactory loggerFactory, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
protected override IRuntime GetRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, Microsoft.Extensions.Logging.ILogger logger, ILoggerFactory loggerFactory, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
{
return Runtime = new TestRuntime(configs, umbracoVersion, ioHelper, logger, loggerFactory, profiler, hostingEnvironment, backOfficeInfo);
}
@@ -119,7 +122,7 @@ namespace Umbraco.Tests.Runtimes
// test runtime
public class TestRuntime : CoreRuntime
{
public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, ILoggerFactory loggerFactory, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, Microsoft.Extensions.Logging.ILogger logger, ILoggerFactory loggerFactory, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
:base(configs, umbracoVersion, ioHelper, logger, loggerFactory, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetTypeFinder(), AppCaches.NoCache)
{

2
src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
View File

@@ -66,7 +66,7 @@ namespace Umbraco.Tests.Services
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var logger = LoggerFactory.Create(builder => builder.AddDebug()).CreateLogger("ProfilingLogger");
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

3
src/Umbraco.Tests/Services/PerformanceTests.cs
View File

@@ -59,7 +59,8 @@ namespace Umbraco.Tests.Services
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var factory = LoggerFactory.Create(builder => builder.AddDebug());
var logger = factory.CreateLogger("ProfilingLogger");
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}