From 894abdd183066d449f267a39fdf784c57048b117 Mon Sep 17 00:00:00 2001 From: Mole Date: Mon, 21 Sep 2020 09:27:54 +0200 Subject: [PATCH] Remove a bunch of references to the old logger --- .../Configuration/XmlConfigManipulator.cs | 2 +- src/Umbraco.Core/Routing/PublishedRouter.cs | 5 +++-- src/Umbraco.Core/Templates/HtmlUrlParser.cs | 5 +++-- .../BatchedDatabaseServerMessenger.cs | 3 ++- src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs | 5 +++-- .../Examine/MediaValueSetBuilder.cs | 6 +++--- src/Umbraco.Infrastructure/Install/InstallHelper.cs | 6 +++--- .../Install/InstallSteps/DatabaseConfigureStep.cs | 7 ++++--- .../Logging/Viewer/LogViewerComposer.cs | 2 +- .../Logging/Viewer/SerilogJsonLogViewer.cs | 5 +++-- .../V_8_0_0/DataTypes/PreValueMigratorCollection.cs | 2 +- .../Models/Mapping/ContentTypeMapDefinition.cs | 12 +++++++----- .../Models/Mapping/DataTypeMapDefinition.cs | 6 +++--- .../Models/Mapping/PropertyTypeGroupMapper.cs | 6 +++--- .../Runtime/CoreInitialComposer.cs | 2 +- .../Search/BackgroundIndexRebuilder.cs | 12 ++++++------ .../Services/Implement/NotificationService.cs | 6 +++--- .../Sync/DatabaseServerMessenger.cs | 5 +++-- .../LiveModelsProvider.cs | 6 +++--- .../PureLiveModelFactory.cs | 5 +++-- .../PublishedSnapshotService.cs | 6 +++--- .../Testing/IntegrationTestComposer.cs | 4 ++-- src/Umbraco.Tests/Logging/LogviewerTests.cs | 2 +- .../PublishedContent/NuCacheChildrenTests.cs | 3 +-- src/Umbraco.Tests/PublishedContent/NuCacheTests.cs | 3 +-- src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs | 4 ++-- .../Services/ContentTypeServiceVariantsTests.cs | 4 ++-- src/Umbraco.Tests/TestHelpers/BaseWebTest.cs | 2 +- src/Umbraco.Tests/Testing/TestingTests/MockTests.cs | 4 ++-- src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 2 +- src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs | 7 +------ .../Controllers/BackOfficeController.cs | 6 +++--- .../Controllers/DictionaryController.cs | 6 +++--- .../Controllers/ExamineManagementController.cs | 2 +- .../Controllers/RedirectUrlManagementController.cs | 2 +- .../Install/InstallApiController.cs | 5 +++-- src/Umbraco.Web.Common/Macros/MacroRenderer.cs | 5 +++-- .../Middleware/UmbracoRequestMiddleware.cs | 7 ++++--- src/Umbraco.Web/Editors/AuthenticationController.cs | 5 +++-- src/Umbraco.Web/Editors/PasswordChanger.cs | 6 +++--- src/Umbraco.Web/Macros/MacroRenderer.cs | 5 +++-- src/Umbraco.Web/Security/MembershipHelper.cs | 9 +++++---- 42 files changed, 108 insertions(+), 99 deletions(-) diff --git a/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs index 65744f49d8..b7c3d5d58b 100644 --- a/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs +++ b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs @@ -4,8 +4,8 @@ using System.IO; using System.Linq; using System.Xml; using System.Xml.Linq; +using Microsoft.Extensions.Logging; using Umbraco.Core.IO; -using Umbraco.Core.Logging; namespace Umbraco.Core.Configuration { diff --git a/src/Umbraco.Core/Routing/PublishedRouter.cs b/src/Umbraco.Core/Routing/PublishedRouter.cs index b7fe066e81..d0f3d73019 100644 --- a/src/Umbraco.Core/Routing/PublishedRouter.cs +++ b/src/Umbraco.Core/Routing/PublishedRouter.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading; using System.Globalization; using System.IO; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; @@ -25,7 +26,7 @@ namespace Umbraco.Web.Routing private readonly IContentLastChanceFinder _contentLastChanceFinder; private readonly IProfilingLogger _profilingLogger; private readonly IVariationContextAccessor _variationContextAccessor; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IPublishedUrlProvider _publishedUrlProvider; private readonly IRequestAccessor _requestAccessor; private readonly IPublishedValueFallback _publishedValueFallback; @@ -43,7 +44,7 @@ namespace Umbraco.Web.Routing IContentLastChanceFinder contentLastChanceFinder, IVariationContextAccessor variationContextAccessor, IProfilingLogger proflog, - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, IPublishedUrlProvider publishedUrlProvider, IRequestAccessor requestAccessor, IPublishedValueFallback publishedValueFallback, diff --git a/src/Umbraco.Core/Templates/HtmlUrlParser.cs b/src/Umbraco.Core/Templates/HtmlUrlParser.cs index 64ffb8d787..8ebe270437 100644 --- a/src/Umbraco.Core/Templates/HtmlUrlParser.cs +++ b/src/Umbraco.Core/Templates/HtmlUrlParser.cs @@ -1,5 +1,6 @@ using System.Text.RegularExpressions; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Logging; using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; using Umbraco.Core.Logging; @@ -9,14 +10,14 @@ namespace Umbraco.Web.Templates public sealed class HtmlUrlParser { private readonly ContentSettings _contentSettings; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IIOHelper _ioHelper; private readonly IProfilingLogger _profilingLogger; private static readonly Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); - public HtmlUrlParser(IOptions contentSettings, ILogger logger ,IProfilingLogger profilingLogger, IIOHelper ioHelper) + public HtmlUrlParser(IOptions contentSettings, Microsoft.Extensions.Logging.ILogger logger ,IProfilingLogger profilingLogger, IIOHelper ioHelper) { _contentSettings = contentSettings.Value; _logger = logger; diff --git a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs index 0170a4aeca..30b8917d05 100644 --- a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs +++ b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Sync; @@ -32,7 +33,7 @@ namespace Umbraco.Web IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, IServerRegistrar serverRegistrar, DatabaseServerMessengerOptions options, IHostingEnvironment hostingEnvironment, diff --git a/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs b/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs index aad1b307e6..a704468f7d 100644 --- a/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs +++ b/src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Extensions.Logging; using System.Threading.Tasks; using Examine; using Umbraco.Core.Composing; @@ -15,11 +16,11 @@ namespace Umbraco.Examine public class IndexRebuilder { private readonly IProfilingLogger _pLogger; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IEnumerable _populators; public IExamineManager ExamineManager { get; } - public IndexRebuilder(IProfilingLogger pLogger, ILogger logger, IExamineManager examineManager, IEnumerable populators) + public IndexRebuilder(IProfilingLogger pLogger, Microsoft.Extensions.Logging.ILogger logger, IExamineManager examineManager, IEnumerable populators) { _pLogger = pLogger; _populators = populators; diff --git a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs index 55811c8906..73ad31e115 100644 --- a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs +++ b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs @@ -2,8 +2,8 @@ using Examine; using System.Collections.Generic; using System.Linq; +using Microsoft.Extensions.Logging; using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; @@ -17,13 +17,13 @@ namespace Umbraco.Examine { private readonly UrlSegmentProviderCollection _urlSegmentProviders; private readonly IUserService _userService; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly IShortStringHelper _shortStringHelper; private readonly IJsonSerializer _serializer; public MediaValueSetBuilder(PropertyEditorCollection propertyEditors, UrlSegmentProviderCollection urlSegmentProviders, - IUserService userService, ILogger logger, IShortStringHelper shortStringHelper, IJsonSerializer serializer) + IUserService userService, ILogger logger, IShortStringHelper shortStringHelper, IJsonSerializer serializer) : base(propertyEditors, false) { _urlSegmentProviders = urlSegmentProviders; diff --git a/src/Umbraco.Infrastructure/Install/InstallHelper.cs b/src/Umbraco.Infrastructure/Install/InstallHelper.cs index e15aa0ab76..1538187528 100644 --- a/src/Umbraco.Infrastructure/Install/InstallHelper.cs +++ b/src/Umbraco.Infrastructure/Install/InstallHelper.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Models; using Umbraco.Net; @@ -22,7 +22,7 @@ namespace Umbraco.Web.Install { private static HttpClient _httpClient; private readonly DatabaseBuilder _databaseBuilder; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly IUmbracoVersion _umbracoVersion; private readonly ConnectionStrings _connectionStrings; private readonly IInstallationService _installationService; @@ -33,7 +33,7 @@ namespace Umbraco.Web.Install private InstallationType? _installationType; public InstallHelper(DatabaseBuilder databaseBuilder, - ILogger logger, + ILogger logger, IUmbracoVersion umbracoVersion, IOptions connectionStrings, IInstallationService installationService, diff --git a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs index 0dceaf9339..7727b6b760 100644 --- a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs +++ b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Web.Install.Models; using Umbraco.Core.Configuration.Models; @@ -16,13 +16,14 @@ namespace Umbraco.Web.Install.InstallSteps public class DatabaseConfigureStep : InstallSetupStep { private readonly DatabaseBuilder _databaseBuilder; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly ConnectionStrings _connectionStrings; - public DatabaseConfigureStep(DatabaseBuilder databaseBuilder, IOptions connectionStrings) + public DatabaseConfigureStep(DatabaseBuilder databaseBuilder, IOptions connectionStrings, ILogger logger) { _databaseBuilder = databaseBuilder; _connectionStrings = connectionStrings.Value ?? throw new ArgumentNullException(nameof(connectionStrings)); + _logger = logger; } public override Task ExecuteAsync(DatabaseModel database) diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs index 0909ec67ad..f28b13ddbf 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs @@ -26,7 +26,7 @@ namespace Umbraco.Core.Logging.Viewer composition.RegisterUnique(factory => { - return new SerilogJsonLogViewer(factory.GetInstance(), + return new SerilogJsonLogViewer(factory.GetInstance>(), factory.GetInstance(), factory.GetInstance(), Log.Logger); diff --git a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs index a985d98453..16c9077bd1 100644 --- a/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs +++ b/src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using Serilog.Events; using Serilog.Formatting.Compact.Reader; @@ -11,10 +12,10 @@ namespace Umbraco.Core.Logging.Viewer internal class SerilogJsonLogViewer : SerilogLogViewerSourceBase { private readonly string _logsPath; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; public SerilogJsonLogViewer( - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, ILogViewerConfig logViewerConfig, ILoggingConfiguration loggingConfiguration, global::Serilog.ILogger serilogLog) diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs index 25730abcac..fbe8e38688 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.Extensions.Logging; using Umbraco.Core.Composing; -using Umbraco.Core.Logging; namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0.DataTypes { diff --git a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs index eb130ae13a..efe24a6efd 100644 --- a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs +++ b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; @@ -30,14 +30,15 @@ namespace Umbraco.Web.Models.Mapping private readonly IContentTypeService _contentTypeService; private readonly IMediaTypeService _mediaTypeService; private readonly IMemberTypeService _memberTypeService; - private readonly ILogger _logger; + private readonly ILoggerFactory _loggerFactory; + private readonly ILogger _logger; private readonly IShortStringHelper _shortStringHelper; private readonly GlobalSettings _globalSettings; private readonly IHostingEnvironment _hostingEnvironment; public ContentTypeMapDefinition(CommonMapper commonMapper, PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IFileService fileService, IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService, - ILogger logger, IShortStringHelper shortStringHelper, IOptions globalSettings, IHostingEnvironment hostingEnvironment) + ILoggerFactory loggerFactory, IShortStringHelper shortStringHelper, IOptions globalSettings, IHostingEnvironment hostingEnvironment) { _commonMapper = commonMapper; _propertyEditors = propertyEditors; @@ -46,7 +47,8 @@ namespace Umbraco.Web.Models.Mapping _contentTypeService = contentTypeService; _mediaTypeService = mediaTypeService; _memberTypeService = memberTypeService; - _logger = logger; + _loggerFactory = loggerFactory; + _logger = _loggerFactory.CreateLogger(); _shortStringHelper = shortStringHelper; _globalSettings = globalSettings.Value; _hostingEnvironment = hostingEnvironment; @@ -534,7 +536,7 @@ namespace Umbraco.Web.Models.Mapping { MapTypeToDisplayBase(source, target); - var groupsMapper = new PropertyTypeGroupMapper(_propertyEditors, _dataTypeService, _shortStringHelper, _logger); + var groupsMapper = new PropertyTypeGroupMapper(_propertyEditors, _dataTypeService, _shortStringHelper, _loggerFactory.CreateLogger>()); target.Groups = groupsMapper.Map(source); } diff --git a/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs index 97ce0c4b5f..0e403cd88b 100644 --- a/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs +++ b/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Configuration.Models; -using Umbraco.Core.Logging; using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; @@ -15,10 +15,10 @@ namespace Umbraco.Web.Models.Mapping public class DataTypeMapDefinition : IMapDefinition { private readonly PropertyEditorCollection _propertyEditors; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly ContentSettings _contentSettings; - public DataTypeMapDefinition(PropertyEditorCollection propertyEditors, ILogger logger, IOptions contentSettings) + public DataTypeMapDefinition(PropertyEditorCollection propertyEditors, ILogger logger, IOptions contentSettings) { _propertyEditors = propertyEditors; _logger = logger; diff --git a/src/Umbraco.Infrastructure/Models/Mapping/PropertyTypeGroupMapper.cs b/src/Umbraco.Infrastructure/Models/Mapping/PropertyTypeGroupMapper.cs index e67fba2206..1bdac7618c 100644 --- a/src/Umbraco.Infrastructure/Models/Mapping/PropertyTypeGroupMapper.cs +++ b/src/Umbraco.Infrastructure/Models/Mapping/PropertyTypeGroupMapper.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Extensions.Logging; using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Services; @@ -17,9 +17,9 @@ namespace Umbraco.Web.Models.Mapping private readonly PropertyEditorCollection _propertyEditors; private readonly IDataTypeService _dataTypeService; private readonly IShortStringHelper _shortStringHelper; - private readonly ILogger _logger; + private readonly ILogger> _logger; - public PropertyTypeGroupMapper(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IShortStringHelper shortStringHelper, ILogger logger) + public PropertyTypeGroupMapper(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IShortStringHelper shortStringHelper, ILogger> logger) { _propertyEditors = propertyEditors; _dataTypeService = dataTypeService; diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs index 8471b98ce0..67adc73589 100644 --- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs +++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs @@ -147,7 +147,7 @@ namespace Umbraco.Core.Runtime factory.GetInstance(), factory.GetInstance(), factory.GetInstance(), - factory.GetInstance(), + factory.GetInstance>(), factory.GetInstance(), true, new DatabaseServerMessengerOptions(), factory.GetInstance(), diff --git a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs index 2b9c59ad53..474496263e 100644 --- a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs +++ b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs @@ -21,17 +21,17 @@ namespace Umbraco.Web.Search private readonly IMainDom _mainDom; // TODO: Remove unused ProfilingLogger? private readonly IProfilingLogger _pLogger; - private readonly Core.Logging.ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly ILoggerFactory _loggerFactory; private readonly IApplicationShutdownRegistry _hostingEnvironment; private static BackgroundTaskRunner _rebuildOnStartupRunner; - public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger pLogger, Core.Logging.ILogger logger, ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder) + public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger pLogger, ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder) { _mainDom = mainDom; _pLogger = pLogger; - _logger = logger; _loggerFactory = loggerFactory; + _logger = loggerFactory.CreateLogger(); _hostingEnvironment = hostingEnvironment; _indexRebuilder = indexRebuilder; } @@ -55,7 +55,7 @@ namespace Umbraco.Web.Search _logger.LogInformation("Starting initialize async background thread."); //do the rebuild on a managed background thread - var task = new RebuildOnStartupTask(_mainDom, _indexRebuilder, _logger as ILogger, onlyEmptyIndexes, waitMilliseconds); + var task = new RebuildOnStartupTask(_mainDom, _indexRebuilder, _loggerFactory.CreateLogger(), onlyEmptyIndexes, waitMilliseconds); _rebuildOnStartupRunner = new BackgroundTaskRunner( "RebuildIndexesOnStartup", @@ -73,12 +73,12 @@ namespace Umbraco.Web.Search private readonly IMainDom _mainDom; private readonly IndexRebuilder _indexRebuilder; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly bool _onlyEmptyIndexes; private readonly int _waitMilliseconds; public RebuildOnStartupTask(IMainDom mainDom, - IndexRebuilder indexRebuilder, ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0) + IndexRebuilder indexRebuilder, Microsoft.Extensions.Logging.ILogger logger, bool onlyEmptyIndexes, int waitMilliseconds = 0) { _mainDom = mainDom; _indexRebuilder = indexRebuilder ?? throw new ArgumentNullException(nameof(indexRebuilder)); diff --git a/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs b/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs index f74ad6038b..7964cd273e 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs @@ -7,9 +7,9 @@ using System.Net.Mail; using System.Text; using System.Threading; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Logging; using Umbraco.Core.Configuration.Models; using Umbraco.Core.IO; -using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; using Umbraco.Core.Models.Membership; @@ -28,11 +28,11 @@ namespace Umbraco.Core.Services.Implement private readonly GlobalSettings _globalSettings; private readonly ContentSettings _contentSettings; private readonly IEmailSender _emailSender; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly IIOHelper _ioHelper; public NotificationService(IScopeProvider provider, IUserService userService, IContentService contentService, ILocalizationService localizationService, - ILogger logger, IIOHelper ioHelper, INotificationsRepository notificationsRepository, IOptions globalSettings, IOptions contentSettings, IEmailSender emailSender) + ILogger logger, IIOHelper ioHelper, INotificationsRepository notificationsRepository, IOptions globalSettings, IOptions contentSettings, IEmailSender emailSender) { _notificationsRepository = notificationsRepository; _globalSettings = globalSettings.Value; diff --git a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs index 14f3f099e4..491836567c 100644 --- a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs +++ b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs @@ -8,6 +8,7 @@ using System.Threading; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NPoco; +using Microsoft.Extensions.Logging; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Logging; @@ -47,7 +48,7 @@ namespace Umbraco.Core.Sync public DatabaseServerMessengerOptions Options { get; } public DatabaseServerMessenger( - IMainDom mainDom, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, ILogger logger, IServerRegistrar serverRegistrar, + IMainDom mainDom, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, Microsoft.Extensions.Logging.ILogger logger, IServerRegistrar serverRegistrar, bool distributedEnabled, DatabaseServerMessengerOptions options, IHostingEnvironment hostingEnvironment, CacheRefresherCollection cacheRefreshers) : base(distributedEnabled) { @@ -72,7 +73,7 @@ namespace Umbraco.Core.Sync + "] " + Guid.NewGuid().ToString("N").ToUpper(); // make it truly unique } - protected ILogger Logger { get; } + protected Microsoft.Extensions.Logging.ILogger Logger { get; } protected IScopeProvider ScopeProvider { get; } diff --git a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs index e8bb2548ed..7e4ad8cfad 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs @@ -2,11 +2,11 @@ using System.Threading; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; +using Microsoft.Extensions.Logging; using Umbraco.Core.Configuration; using Umbraco.Configuration; using Umbraco.Core; using Umbraco.Core.Hosting; -using Umbraco.Core.Logging; using Umbraco.ModelsBuilder.Embedded.Building; using Umbraco.Web.Cache; using Umbraco.Core.Configuration.Models; @@ -19,7 +19,7 @@ namespace Umbraco.ModelsBuilder.Embedded { private static Mutex _mutex; private static int _req; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly ModelsBuilderConfig _config; private readonly ModelsGenerator _modelGenerator; private readonly ModelsGenerationError _mbErrors; @@ -28,7 +28,7 @@ namespace Umbraco.ModelsBuilder.Embedded // we do not manage pure live here internal bool IsEnabled => _config.ModelsMode.IsLiveNotPure(); - public LiveModelsProvider(ILogger logger, IOptions config, ModelsGenerator modelGenerator, ModelsGenerationError mbErrors, IHostingEnvironment hostingEnvironment) + public LiveModelsProvider(ILogger logger, IOptions config, ModelsGenerator modelGenerator, ModelsGenerationError mbErrors, IHostingEnvironment hostingEnvironment) { _logger = logger; _config = config.Value ?? throw new ArgumentNullException(nameof(config)); diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs index f967060ecb..6bf2f4f8c5 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs @@ -8,6 +8,7 @@ using System.Reflection.Emit; using System.Text; using System.Text.RegularExpressions; using System.Threading; +using Microsoft.Extensions.Logging; using Umbraco.Core.Configuration; using Umbraco.Core; using Umbraco.Core.Hosting; @@ -27,7 +28,7 @@ namespace Umbraco.ModelsBuilder.Embedded private volatile bool _hasModels; // volatile 'cos reading outside lock private bool _pendingRebuild; private readonly IProfilingLogger _profilingLogger; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly FileSystemWatcher _watcher; private int _ver, _skipver; private readonly int _debugLevel; @@ -48,7 +49,7 @@ namespace Umbraco.ModelsBuilder.Embedded public PureLiveModelFactory( Lazy umbracoServices, IProfilingLogger profilingLogger, - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, IOptions config, IHostingEnvironment hostingEnvironment, IApplicationShutdownRegistry hostingLifetime, diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs index 3c23e1311d..7dc1be3b66 100644 --- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs @@ -45,7 +45,7 @@ namespace Umbraco.Web.PublishedCache.NuCache private readonly IProfilingLogger _profilingLogger; private readonly IScopeProvider _scopeProvider; private readonly IDataSource _dataSource; - private readonly Core.Logging.ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly ILoggerFactory _loggerFactory; private readonly IDocumentRepository _documentRepository; private readonly IMediaRepository _mediaRepository; @@ -87,7 +87,7 @@ namespace Umbraco.Web.PublishedCache.NuCache public PublishedSnapshotService(PublishedSnapshotServiceOptions options, IMainDom mainDom, IRuntimeState runtime, ServiceContext serviceContext, IPublishedContentTypeFactory publishedContentTypeFactory, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, - IProfilingLogger profilingLogger, Core.Logging.ILogger logger, + IProfilingLogger profilingLogger, ILoggerFactory loggerFactory, IScopeProvider scopeProvider, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, @@ -110,8 +110,8 @@ namespace Umbraco.Web.PublishedCache.NuCache _publishedContentTypeFactory = publishedContentTypeFactory; _profilingLogger = profilingLogger; _dataSource = dataSource; - _logger = logger; _loggerFactory = loggerFactory; + _logger = _loggerFactory.CreateLogger(); _scopeProvider = scopeProvider; _documentRepository = documentRepository; _mediaRepository = mediaRepository; diff --git a/src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs b/src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs index cf5bbf1473..7d8965be87 100644 --- a/src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs +++ b/src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs @@ -92,8 +92,8 @@ namespace Umbraco.Tests.Integration.Testing // replace the default so there is no background index rebuilder private class TestBackgroundIndexRebuilder : BackgroundIndexRebuilder { - public TestBackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger pLogger, Core.Logging.ILogger logger, ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder) - : base(mainDom, pLogger, logger, loggerFactory, hostingEnvironment, indexRebuilder) + public TestBackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger pLogger, ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder) + : base(mainDom, pLogger, loggerFactory, hostingEnvironment, indexRebuilder) { } diff --git a/src/Umbraco.Tests/Logging/LogviewerTests.cs b/src/Umbraco.Tests/Logging/LogviewerTests.cs index 0a193b4446..3e2771a907 100644 --- a/src/Umbraco.Tests/Logging/LogviewerTests.cs +++ b/src/Umbraco.Tests/Logging/LogviewerTests.cs @@ -55,7 +55,7 @@ namespace Umbraco.Tests.Logging File.Copy(exampleLogfilePath, _newLogfilePath, true); File.Copy(exampleSearchfilePath, _newSearchfilePath, true); - var logger = Mock.Of(); + var logger = Mock.Of>(); var logViewerConfig = new LogViewerConfig(hostingEnv); _logViewer = new SerilogJsonLogViewer(logger, logViewerConfig, loggingConfiguration, Log.Logger); } diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs index 0a329c4719..69ba0f7b2d 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs @@ -155,8 +155,7 @@ namespace Umbraco.Tests.PublishedContent _snapshotAccessor, _variationAccesor, Mock.Of(), - Mock.Of>(), - Mock.Of(), + NullLoggerFactory.Instance, scopeProvider.Object, Mock.Of(), Mock.Of(), diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs index 4e491e742b..8b9f20db88 100644 --- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs +++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs @@ -195,8 +195,7 @@ namespace Umbraco.Tests.PublishedContent new TestPublishedSnapshotAccessor(), _variationAccesor, Mock.Of(), - Mock.Of>(), - Mock.Of(), + NullLoggerFactory.Instance, scopeProvider, Mock.Of(), Mock.Of(), diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs index 9814f79950..156044e66b 100644 --- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs +++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Routing; +using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -101,8 +102,7 @@ namespace Umbraco.Tests.Scoping publishedSnapshotAccessor, Mock.Of(), ProfilingLogger, - Mock.Of>(), - Mock.Of(), + NullLoggerFactory.Instance, ScopeProvider, documentRepository, mediaRepository, memberRepository, DefaultCultureAccessor, diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs index 58d2e27f4d..8ea3a560bf 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; +using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -73,8 +74,7 @@ namespace Umbraco.Tests.Services publishedSnapshotAccessor, Mock.Of(), ProfilingLogger, - Mock.Of>(), - Mock.Of(), + NullLoggerFactory.Instance, ScopeProvider, documentRepository, mediaRepository, memberRepository, DefaultCultureAccessor, diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs index 74e630025e..4fa3546c7d 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs @@ -106,7 +106,7 @@ namespace Umbraco.Tests.TestHelpers new TestLastChanceFinder(), new TestVariationContextAccessor(), new ProfilingLogger(Mock.Of(), Mock.Of()), - Mock.Of>(), + Mock.Of>(), Mock.Of(), Mock.Of(), container?.GetInstance() ?? Current.Factory.GetInstance(), diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs index 96907654c4..9f23c20104 100644 --- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs +++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Linq; using System.Web; using System.Web.Security; +using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -105,11 +106,10 @@ namespace Umbraco.Tests.Testing.TestingTests public void Can_Mock_UmbracoApiController_Dependencies_With_Injected_UmbracoMapper() { var pLogger = Mock.Of(); - var logger = Mock.Of(); var memberService = Mock.Of(); var memberTypeService = Mock.Of(); var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver()); - var membershipHelper = new MembershipHelper(Mock.Of(), Mock.Of(), membershipProvider, Mock.Of(), memberService, memberTypeService, Mock.Of(), AppCaches.Disabled, logger, ShortStringHelper, Mock.Of()); + var membershipHelper = new MembershipHelper(Mock.Of(), Mock.Of(), membershipProvider, Mock.Of(), memberService, memberTypeService, Mock.Of(), AppCaches.Disabled, NullLoggerFactory.Instance, ShortStringHelper, Mock.Of()); var umbracoMapper = new UmbracoMapper(new MapDefinitionCollection(new[] { Mock.Of() })); var umbracoApiController = new FakeUmbracoApiController(new GlobalSettings(), Mock.Of(), Mock.Of(), ServiceContext.CreatePartial(), AppCaches.NoCache, pLogger, Mock.Of(), umbracoMapper, Mock.Of()); diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 821b72f4d8..e78dc7f79f 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -225,7 +225,7 @@ namespace Umbraco.Tests.Testing var memberService = Mock.Of(); var memberTypeService = Mock.Of(); var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver()); - var membershipHelper = new MembershipHelper(Mock.Of(), Mock.Of(), membershipProvider, Mock.Of(), memberService, memberTypeService, Mock.Of(), AppCaches.Disabled, logger, ShortStringHelper, Mock.Of()); + var membershipHelper = new MembershipHelper(Mock.Of(), Mock.Of(), membershipProvider, Mock.Of(), memberService, memberTypeService, Mock.Of(), AppCaches.Disabled, loggerFactory, ShortStringHelper, Mock.Of()); Composition.RegisterUnique(membershipHelper); diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs index 0304f4005f..bc6df5d9ad 100644 --- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs +++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs @@ -57,7 +57,7 @@ namespace Umbraco.Tests.UmbracoExamine public static MediaIndexPopulator GetMediaIndexRebuilder(PropertyEditorCollection propertyEditors, IMediaService mediaService) { - var mediaValueSetBuilder = new MediaValueSetBuilder(propertyEditors, new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(TestHelper.ShortStringHelper) }), GetMockUserService(), Mock.Of(), TestHelper.ShortStringHelper, TestHelper.JsonSerializer); + var mediaValueSetBuilder = new MediaValueSetBuilder(propertyEditors, new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(TestHelper.ShortStringHelper) }), GetMockUserService(), Mock.Of>(), TestHelper.ShortStringHelper, TestHelper.JsonSerializer); var mediaIndexDataSource = new MediaIndexPopulator(null, mediaService, mediaValueSetBuilder); return mediaIndexDataSource; } @@ -163,11 +163,6 @@ namespace Umbraco.Tests.UmbracoExamine return new ProfilingLogger(Mock.Of(), Mock.Of()); } - public static Core.Logging.ILogger GetMockLogger() - { - return Mock.Of>(); - } - public static UmbracoContentIndex GetUmbracoIndexer( IProfilingLogger profilingLogger, IHostingEnvironment hostingEnvironment, diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs index 24d46e894f..963b92f6e3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.BackOffice; using Umbraco.Core.Cache; @@ -14,7 +15,6 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.Grid; using Umbraco.Core.Configuration.Models; using Umbraco.Core.Hosting; -using Umbraco.Core.Logging; using Umbraco.Core.Services; using Umbraco.Core.WebAssets; using Umbraco.Extensions; @@ -46,7 +46,7 @@ namespace Umbraco.Web.BackOffice.Controllers private readonly AppCaches _appCaches; private readonly BackOfficeSignInManager _signInManager; private readonly IWebSecurity _webSecurity; - private readonly ILogger _logger; + private readonly ILogger _logger; public BackOfficeController( BackOfficeUserManager userManager, @@ -60,7 +60,7 @@ namespace Umbraco.Web.BackOffice.Controllers AppCaches appCaches, BackOfficeSignInManager signInManager, IWebSecurity webSecurity, - ILogger logger) + ILogger logger) { _userManager = userManager; _runtimeMinifier = runtimeMinifier; diff --git a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs b/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs index c61f727a5d..1f89c85ba9 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; using Umbraco.Core.Mapping; using Umbraco.Core.Models; using Umbraco.Core.Services; @@ -32,7 +32,7 @@ namespace Umbraco.Web.BackOffice.Controllers [UmbracoTreeAuthorize(Constants.Trees.Dictionary)] public class DictionaryController : BackOfficeNotificationsController { - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly ILocalizationService _localizationService; private readonly IWebSecurity _webSecurity; private readonly GlobalSettings _globalSettings; @@ -40,7 +40,7 @@ namespace Umbraco.Web.BackOffice.Controllers private readonly UmbracoMapper _umbracoMapper; public DictionaryController( - ILogger logger, + ILogger logger, ILocalizationService localizationService, IWebSecurity webSecurity, IOptions globalSettings, diff --git a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs index 3bd984b579..72f07c02f3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs @@ -4,10 +4,10 @@ using System.Linq; using Examine; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.IO; -using Umbraco.Core.Logging; using Umbraco.Examine; using Umbraco.Extensions; using Umbraco.Web.Common.Attributes; diff --git a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs index c503de68f5..fcec6d0699 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs @@ -2,7 +2,7 @@ using System.Xml; using System.Security; using Microsoft.AspNetCore.Mvc; -using Umbraco.Core.Logging; +using Microsoft.Extensions.Logging; using Umbraco.Core.Models; using Umbraco.Web.Models.ContentEditing; using Umbraco.Core; diff --git a/src/Umbraco.Web.Common/Install/InstallApiController.cs b/src/Umbraco.Web.Common/Install/InstallApiController.cs index 6e535e60dd..697a110080 100644 --- a/src/Umbraco.Web.Common/Install/InstallApiController.cs +++ b/src/Umbraco.Web.Common/Install/InstallApiController.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using Umbraco.Core; using Umbraco.Core.Logging; @@ -31,10 +32,10 @@ namespace Umbraco.Web.Common.Install private readonly InstallStatusTracker _installStatusTracker; private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime; private readonly InstallStepCollection _installSteps; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IProfilingLogger _proflog; - public InstallApiController(DatabaseBuilder databaseBuilder, IProfilingLogger proflog, ILogger logger, + public InstallApiController(DatabaseBuilder databaseBuilder, IProfilingLogger proflog, Microsoft.Extensions.Logging.ILogger logger, InstallHelper installHelper, InstallStepCollection installSteps, InstallStatusTracker installStatusTracker, IUmbracoApplicationLifetime umbracoApplicationLifetime) { diff --git a/src/Umbraco.Web.Common/Macros/MacroRenderer.cs b/src/Umbraco.Web.Common/Macros/MacroRenderer.cs index d0474e0d29..e40917b36d 100644 --- a/src/Umbraco.Web.Common/Macros/MacroRenderer.cs +++ b/src/Umbraco.Web.Common/Macros/MacroRenderer.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration.Models; @@ -22,7 +23,7 @@ namespace Umbraco.Web.Macros public class MacroRenderer : IMacroRenderer { private readonly IProfilingLogger _plogger; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IUmbracoContextAccessor _umbracoContextAccessor; private readonly ContentSettings _contentSettings; private readonly ILocalizedTextService _textService; @@ -37,7 +38,7 @@ namespace Umbraco.Web.Macros public MacroRenderer( IProfilingLogger plogger, - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, IOptions contentSettings, ILocalizedTextService textService, diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs index fe46349559..d3474bf604 100644 --- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs +++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; +using Microsoft.Extensions.Logging; using Umbraco.Web.Common.Lifetime; using Umbraco.Core; using Umbraco.Core.Logging; @@ -20,13 +21,13 @@ namespace Umbraco.Web.Common.Middleware /// public class UmbracoRequestMiddleware : IMiddleware { - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IUmbracoRequestLifetimeManager _umbracoRequestLifetimeManager; private readonly IUmbracoContextFactory _umbracoContextFactory; private readonly IRequestCache _requestCache; public UmbracoRequestMiddleware( - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, IUmbracoRequestLifetimeManager umbracoRequestLifetimeManager, IUmbracoContextFactory umbracoContextFactory, IRequestCache requestCache) @@ -104,7 +105,7 @@ namespace Umbraco.Web.Common.Middleware /// /// /// - private static void DisposeRequestCacheItems(ILogger logger, IRequestCache requestCache, Uri requestUri) + private static void DisposeRequestCacheItems(Microsoft.Extensions.Logging.ILogger logger, IRequestCache requestCache, Uri requestUri) { // do not process if client-side request if (requestUri.IsClientSideRequest()) diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs index e4d3c043c5..1ccb9619d6 100644 --- a/src/Umbraco.Web/Editors/AuthenticationController.cs +++ b/src/Umbraco.Web/Editors/AuthenticationController.cs @@ -11,6 +11,7 @@ using System.Web.Http; using System.Web.Mvc; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Models; @@ -48,7 +49,7 @@ namespace Umbraco.Web.Editors private BackOfficeSignInManager _signInManager; private readonly IUserPasswordConfiguration _passwordConfiguration; private readonly IHostingEnvironment _hostingEnvironment; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IRuntimeState _runtimeState; private readonly SecuritySettings _securitySettings; private readonly IRequestAccessor _requestAccessor; @@ -63,7 +64,7 @@ namespace Umbraco.Web.Editors ServiceContext services, AppCaches appCaches, IProfilingLogger pLogger, - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, IRuntimeState runtimeState, UmbracoMapper umbracoMapper, IOptions securitySettings, diff --git a/src/Umbraco.Web/Editors/PasswordChanger.cs b/src/Umbraco.Web/Editors/PasswordChanger.cs index 06b4ea3367..be6a20e7cc 100644 --- a/src/Umbraco.Web/Editors/PasswordChanger.cs +++ b/src/Umbraco.Web/Editors/PasswordChanger.cs @@ -1,8 +1,8 @@ using System; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; using Umbraco.Core; -using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Extensions; using Umbraco.Web.Models; @@ -14,9 +14,9 @@ namespace Umbraco.Web.Editors { internal class PasswordChanger { - private readonly ILogger _logger; + private readonly ILogger _logger; - public PasswordChanger(ILogger logger) + public PasswordChanger(ILogger logger) { _logger = logger; } diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs index e185f62bc5..77321edbdf 100644 --- a/src/Umbraco.Web/Macros/MacroRenderer.cs +++ b/src/Umbraco.Web/Macros/MacroRenderer.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Text; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Logging; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration.Models; @@ -21,7 +22,7 @@ namespace Umbraco.Web.Macros internal class MacroRenderer : IMacroRenderer { private readonly IProfilingLogger _plogger; - private readonly ILogger _logger; + private readonly Microsoft.Extensions.Logging.ILogger _logger; private readonly IUmbracoContextAccessor _umbracoContextAccessor; private readonly ContentSettings _contentSettings; private readonly ILocalizedTextService _textService; @@ -37,7 +38,7 @@ namespace Umbraco.Web.Macros public MacroRenderer( IProfilingLogger plogger, - ILogger logger, + Microsoft.Extensions.Logging.ILogger logger, IUmbracoContextAccessor umbracoContextAccessor, IOptions contentSettings, ILocalizedTextService textService, diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs index 00758b2a65..d9fe3edbda 100644 --- a/src/Umbraco.Web/Security/MembershipHelper.cs +++ b/src/Umbraco.Web/Security/MembershipHelper.cs @@ -16,7 +16,6 @@ using Umbraco.Core.Strings; using Umbraco.Web.Editors; using Umbraco.Web.Security.Providers; using System.ComponentModel.DataAnnotations; -using ILogger = Umbraco.Core.Logging.ILogger; namespace Umbraco.Web.Security { @@ -32,6 +31,7 @@ namespace Umbraco.Web.Security private readonly IMemberTypeService _memberTypeService; private readonly IPublicAccessService _publicAccessService; private readonly AppCaches _appCaches; + private readonly ILoggerFactory _loggerFactory; private readonly ILogger _logger; private readonly IShortStringHelper _shortStringHelper; private readonly IEntityService _entityService; @@ -48,7 +48,7 @@ namespace Umbraco.Web.Security IMemberTypeService memberTypeService, IPublicAccessService publicAccessService, AppCaches appCaches, - ILogger logger, + ILoggerFactory loggerFactory, IShortStringHelper shortStringHelper, IEntityService entityService ) @@ -59,7 +59,8 @@ namespace Umbraco.Web.Security _memberTypeService = memberTypeService; _publicAccessService = publicAccessService; _appCaches = appCaches; - _logger = logger; + _loggerFactory = loggerFactory; + _logger = _loggerFactory.CreateLogger(); _shortStringHelper = shortStringHelper; _membershipProvider = membershipProvider ?? throw new ArgumentNullException(nameof(membershipProvider)); @@ -706,7 +707,7 @@ namespace Umbraco.Web.Security /// public virtual Attempt ChangePassword(string username, ChangingPasswordModel passwordModel, MembershipProvider membershipProvider) { - var passwordChanger = new PasswordChanger(_logger); + var passwordChanger = new PasswordChanger(_loggerFactory.CreateLogger()); return ChangePasswordWithMembershipProvider(username, passwordModel, membershipProvider); }