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

Use generic logger more places and clean up

Browse Source
This commit is contained in:
Mole
2020-09-28 14:59:17 +02:00
parent b5aedde616
commit d750d2c2c1
40 changed files with 86 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Infrastructure/CompositionExtensions_Essentials.cs
View File

@@ -5,9 +5,7 @@ using Umbraco.Core.Configuration;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations;
using Umbraco.Core.Persistence;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Core
{

5
src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
View File

@@ -15,7 +15,6 @@ using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Umbraco.Core.Runtime
{
@@ -176,7 +175,7 @@ namespace Umbraco.Core.Runtime
var databaseFactory = CreateDatabaseFactory();
// type finder/loader
var typeLoader = new TypeLoader(TypeFinder, AppCaches.RuntimeCache, new DirectoryInfo(HostingEnvironment.LocalTempPath), RuntimeLoggerFactory.CreateLogger("TypeLoader"), ProfilingLogger);
var typeLoader = new TypeLoader(TypeFinder, AppCaches.RuntimeCache, new DirectoryInfo(HostingEnvironment.LocalTempPath), RuntimeLoggerFactory.CreateLogger<TypeLoader>(), ProfilingLogger);
// re-create the state object with the essential services
_state = new RuntimeState(_globalSettings, UmbracoVersion, databaseFactory, RuntimeLoggerFactory.CreateLogger<RuntimeState>());
@@ -296,7 +295,7 @@ namespace Umbraco.Core.Runtime
enableDisableAttributes = typeLoader.GetAssemblyAttributes(typeof(EnableComposerAttribute), typeof(DisableComposerAttribute));
}
var composers = new Composers(composition, composerTypes, enableDisableAttributes, RuntimeLoggerFactory.CreateLogger("Composers"), ProfilingLogger);
var composers = new Composers(composition, composerTypes, enableDisableAttributes, RuntimeLoggerFactory.CreateLogger<Composers>(), ProfilingLogger);
composers.Compose();
}

2
src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
View File

@@ -218,7 +218,7 @@ namespace Umbraco.Web.Scheduling
var task = new TempFileCleanup(_fileCleanupRunner, DefaultDelayMilliseconds, OneHourMilliseconds,
tempFolderPaths.Select(x=>new DirectoryInfo(x)),
TimeSpan.FromDays(1), //files that are over a day old
_mainDom, _pLogger, _loggerFactory.CreateLogger("TempFileCleanup"));
_mainDom, _pLogger, _loggerFactory.CreateLogger<TempFileCleanup>());
_scrubberRunner.TryAdd(task);
return task;
}