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

Remove a bunch of references to the old logger

Browse Source
This commit is contained in:
Mole
2020-09-21 09:27:54 +02:00
parent 8ff33e3cd0
commit 894abdd183
42 changed files with 108 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
View File

@@ -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<BatchedDatabaseServerMessenger> logger,
IServerRegistrar serverRegistrar,
DatabaseServerMessengerOptions options,
IHostingEnvironment hostingEnvironment,

5
src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
View File

@@ -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<IndexRebuilder> _logger;
private readonly Microsoft.Extensions.Logging.ILogger<IndexRebuilder> _logger;
private readonly IEnumerable<IIndexPopulator> _populators;
public IExamineManager ExamineManager { get; }
public IndexRebuilder(IProfilingLogger pLogger, ILogger<IndexRebuilder> logger, IExamineManager examineManager, IEnumerable<IIndexPopulator> populators)
public IndexRebuilder(IProfilingLogger pLogger, Microsoft.Extensions.Logging.ILogger<IndexRebuilder> logger, IExamineManager examineManager, IEnumerable<IIndexPopulator> populators)
{
_pLogger = pLogger;
_populators = populators;

6
src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
View File

@@ -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<MediaValueSetBuilder> _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<MediaValueSetBuilder> logger, IShortStringHelper shortStringHelper, IJsonSerializer serializer)
: base(propertyEditors, false)
{
_urlSegmentProviders = urlSegmentProviders;

6
src/Umbraco.Infrastructure/Install/InstallHelper.cs
View File

@@ -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<InstallHelper> _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<InstallHelper> logger,
IUmbracoVersion umbracoVersion,
IOptions<ConnectionStrings> connectionStrings,
IInstallationService installationService,

7
src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs
View File

@@ -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<DatabaseModel>
{
private readonly DatabaseBuilder _databaseBuilder;
private readonly ILogger _logger;
private readonly ILogger<DatabaseConfigureStep> _logger;
private readonly ConnectionStrings _connectionStrings;
public DatabaseConfigureStep(DatabaseBuilder databaseBuilder, IOptions<ConnectionStrings> connectionStrings)
public DatabaseConfigureStep(DatabaseBuilder databaseBuilder, IOptions<ConnectionStrings> connectionStrings, ILogger<DatabaseConfigureStep> logger)
{
_databaseBuilder = databaseBuilder;
_connectionStrings = connectionStrings.Value ?? throw new ArgumentNullException(nameof(connectionStrings));
_logger = logger;
}
public override Task<InstallSetupResult> ExecuteAsync(DatabaseModel database)

2
src/Umbraco.Infrastructure/Logging/Viewer/LogViewerComposer.cs
View File

@@ -26,7 +26,7 @@ namespace Umbraco.Core.Logging.Viewer
composition.RegisterUnique<ILogViewer>(factory =>
{
return new SerilogJsonLogViewer(factory.GetInstance<ILogger>(),
return new SerilogJsonLogViewer(factory.GetInstance<Microsoft.Extensions.Logging.ILogger<SerilogJsonLogViewer>>(),
factory.GetInstance<ILogViewerConfig>(),
factory.GetInstance<ILoggingConfiguration>(),
Log.Logger);

5
src/Umbraco.Infrastructure/Logging/Viewer/SerilogJsonLogViewer.cs
View File

@@ -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<SerilogJsonLogViewer> _logger;
public SerilogJsonLogViewer(
ILogger logger,
Microsoft.Extensions.Logging.ILogger<SerilogJsonLogViewer> logger,
ILogViewerConfig logViewerConfig,
ILoggingConfiguration loggingConfiguration,
global::Serilog.ILogger serilogLog)

2
src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/DataTypes/PreValueMigratorCollection.cs
View File

@@ -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
{

12
src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -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<ContentTypeMapDefinition> _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> globalSettings, IHostingEnvironment hostingEnvironment)
ILoggerFactory loggerFactory, IShortStringHelper shortStringHelper, IOptions<GlobalSettings> 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<ContentTypeMapDefinition>();
_shortStringHelper = shortStringHelper;
_globalSettings = globalSettings.Value;
_hostingEnvironment = hostingEnvironment;
@@ -534,7 +536,7 @@ namespace Umbraco.Web.Models.Mapping
{
MapTypeToDisplayBase(source, target);
var groupsMapper = new PropertyTypeGroupMapper<TTargetPropertyType>(_propertyEditors, _dataTypeService, _shortStringHelper, _logger);
var groupsMapper = new PropertyTypeGroupMapper<TTargetPropertyType>(_propertyEditors, _dataTypeService, _shortStringHelper, _loggerFactory.CreateLogger<PropertyTypeGroupMapper<TTargetPropertyType>>());
target.Groups = groupsMapper.Map(source);
}

6
src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs
View File

@@ -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<DataTypeMapDefinition> _logger;
private readonly ContentSettings _contentSettings;
public DataTypeMapDefinition(PropertyEditorCollection propertyEditors, ILogger logger, IOptions<ContentSettings> contentSettings)
public DataTypeMapDefinition(PropertyEditorCollection propertyEditors, ILogger<DataTypeMapDefinition> logger, IOptions<ContentSettings> contentSettings)
{
_propertyEditors = propertyEditors;
_logger = logger;

6
src/Umbraco.Infrastructure/Models/Mapping/PropertyTypeGroupMapper.cs
View File

@@ -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<PropertyTypeGroupMapper<TPropertyType>> _logger;
public PropertyTypeGroupMapper(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IShortStringHelper shortStringHelper, ILogger logger)
public PropertyTypeGroupMapper(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IShortStringHelper shortStringHelper, ILogger<PropertyTypeGroupMapper<TPropertyType>> logger)
{
_propertyEditors = propertyEditors;
_dataTypeService = dataTypeService;

2
src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
View File

@@ -147,7 +147,7 @@ namespace Umbraco.Core.Runtime
factory.GetInstance<IScopeProvider>(),
factory.GetInstance<ISqlContext>(),
factory.GetInstance<IProfilingLogger>(),
factory.GetInstance<ILogger>(),
factory.GetInstance<Microsoft.Extensions.Logging.ILogger<DatabaseServerMessenger>>(),
factory.GetInstance<IServerRegistrar>(),
true, new DatabaseServerMessengerOptions(),
factory.GetInstance<IHostingEnvironment>(),

12
src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
View File

@@ -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<BackgroundIndexRebuilder> _logger;
private readonly Microsoft.Extensions.Logging.ILogger<BackgroundIndexRebuilder> _logger;
private readonly ILoggerFactory _loggerFactory;
private readonly IApplicationShutdownRegistry _hostingEnvironment;
private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger pLogger, Core.Logging.ILogger<BackgroundIndexRebuilder> 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<BackgroundIndexRebuilder>();
_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<RebuildOnStartupTask>(), onlyEmptyIndexes, waitMilliseconds);
_rebuildOnStartupRunner = new BackgroundTaskRunner<IBackgroundTask>(
"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<RebuildOnStartupTask> _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<RebuildOnStartupTask> logger, bool onlyEmptyIndexes, int waitMilliseconds = 0)
{
_mainDom = mainDom;
_indexRebuilder = indexRebuilder ?? throw new ArgumentNullException(nameof(indexRebuilder));

6
src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
View File

@@ -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<NotificationService> _logger;
private readonly IIOHelper _ioHelper;
public NotificationService(IScopeProvider provider, IUserService userService, IContentService contentService, ILocalizationService localizationService,
ILogger logger, IIOHelper ioHelper, INotificationsRepository notificationsRepository, IOptions<GlobalSettings> globalSettings, IOptions<ContentSettings> contentSettings, IEmailSender emailSender)
ILogger<NotificationService> logger, IIOHelper ioHelper, INotificationsRepository notificationsRepository, IOptions<GlobalSettings> globalSettings, IOptions<ContentSettings> contentSettings, IEmailSender emailSender)
{
_notificationsRepository = notificationsRepository;
_globalSettings = globalSettings.Value;

5
src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs
View File

@@ -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<DatabaseServerMessenger> 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<DatabaseServerMessenger> Logger { get; }
protected IScopeProvider ScopeProvider { get; }