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

Cleanup

Browse Source 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Bjarke Berg
2020-09-29 10:42:06 +02:00
parent 8dc1c9768c
commit 81e2ebda96
20 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,14 +15,14 @@ namespace Umbraco.Examine
/// </summary>
public class IndexRebuilder
{
private readonly IProfilingLogger _pLogger;
private readonly IProfilingLogger _profilingLogger;
private readonly 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 profilingLogger , ILogger<IndexRebuilder> logger, IExamineManager examineManager, IEnumerable<IIndexPopulator> populators)
{
_pLogger = pLogger;
_profilingLogger = profilingLogger ;
_populators = populators;
_logger = logger;
ExamineManager = examineManager;

1
src/Umbraco.Infrastructure/PropertyEditors/TextOnlyValueEditor.cs
View File

@@ -20,7 +20,6 @@ namespace Umbraco.Web.PropertyEditors
/// A method used to format the database value to a value that can be used by the editor
/// </summary>
/// <param name="property"></param>
/// <param name="dataTypeService"></param>
/// <param name="culture"></param>
/// <param name="segment"></param>
/// <returns></returns>

4
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/GridValueConverter.cs
View File

@@ -18,8 +18,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
{
private readonly IGridConfig _config;
public GridValueConverter(PropertyEditorCollection propertyEditors, IGridConfig config)
: base(propertyEditors)
public GridValueConverter(PropertyEditorCollection propertyEditors, IGridConfig config, ILogger<GridValueConverter> logger)
: base(propertyEditors, logger)
{
_config = config;
}

11
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
View File

@@ -2,9 +2,7 @@
using System.Globalization;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Umbraco.Core.Composing;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Composing;
namespace Umbraco.Core.PropertyEditors.ValueConverters
{
@@ -14,6 +12,13 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
[DefaultPropertyValueConverter(typeof(JsonValueConverter))]
public class ImageCropperValueConverter : PropertyValueConverterBase
{
private readonly ILogger<ImageCropperValueConverter> _logger;
public ImageCropperValueConverter(ILogger<ImageCropperValueConverter> logger)
{
_logger = logger;
}
/// <inheritdoc />
public override bool IsConverter(IPublishedPropertyType propertyType)
=> propertyType.EditorAlias.InvariantEquals(Constants.PropertyEditors.Aliases.ImageCropper);
@@ -44,7 +49,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
catch (Exception ex)
{
// cannot deserialize, assume it may be a raw image url
Current.Logger.LogError(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString);
_logger.LogError(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString);
value = new ImageCropperValue { Src = sourceString };
}

8
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
View File

@@ -2,9 +2,7 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core.Composing;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Composing;
namespace Umbraco.Core.PropertyEditors.ValueConverters
{
@@ -18,13 +16,15 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
public class JsonValueConverter : PropertyValueConverterBase
{
private readonly PropertyEditorCollection _propertyEditors;
private readonly ILogger<JsonValueConverter> _logger;
/// <summary>
/// Initializes a new instance of the <see cref="JsonValueConverter"/> class.
/// </summary>
public JsonValueConverter(PropertyEditorCollection propertyEditors)
public JsonValueConverter(PropertyEditorCollection propertyEditors, ILogger<JsonValueConverter> logger)
{
_propertyEditors = propertyEditors;
_logger = logger;
}
/// <summary>
@@ -58,7 +58,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
}
catch (Exception ex)
{
Current.Logger.LogError(ex, "Could not parse the string '{JsonString}' to a json object", sourceString);
_logger.LogError(ex, "Could not parse the string '{JsonString}' to a json object", sourceString);
}
}

8
src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Web.Scheduling
private readonly HealthCheckCollection _healthChecks;
private readonly HealthCheckNotificationMethodCollection _notifications;
private readonly IScopeProvider _scopeProvider;
private readonly IProfilingLogger _pLogger;
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<HealthCheckNotifier> _logger;
private readonly HealthChecksSettings _healthChecksSettings;
private readonly IServerRegistrar _serverRegistrar;
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Scheduling
HealthCheckCollection healthChecks,
HealthCheckNotificationMethodCollection notifications,
IMainDom mainDom,
IProfilingLogger pLogger,
IProfilingLogger profilingLogger ,
ILogger<HealthCheckNotifier> logger,
HealthChecksSettings healthChecksSettings,
IServerRegistrar serverRegistrar,
@@ -43,7 +43,7 @@ namespace Umbraco.Web.Scheduling
_mainDom = mainDom;
_scopeProvider = scopeProvider;
_runtimeState = runtimeState;
_pLogger = pLogger;
_profilingLogger = profilingLogger ;
_logger = logger;
_healthChecksSettings = healthChecksSettings;
_serverRegistrar = serverRegistrar;
@@ -76,7 +76,7 @@ namespace Umbraco.Web.Scheduling
// checks can be making service/database calls so we want to ensure the CallContext/Ambient scope
// isn't used since that can be problematic.
using (var scope = _scopeProvider.CreateScope())
using (_pLogger.DebugDuration<HealthCheckNotifier>("Health checks executing", "Health checks complete"))
using (_profilingLogger.DebugDuration<HealthCheckNotifier>("Health checks executing", "Health checks complete"))
{
var healthCheckConfig = _healthChecksSettings;

8
src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
View File

@@ -17,12 +17,12 @@ namespace Umbraco.Web.Scheduling
private readonly IServerRegistrar _serverRegistrar;
private readonly IAuditService _auditService;
private readonly LoggingSettings _settings;
private readonly IProfilingLogger _pLogger;
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<LogScrubber> _logger;
private readonly IScopeProvider _scopeProvider;
public LogScrubber(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
IMainDom mainDom, IServerRegistrar serverRegistrar, IAuditService auditService, IOptions<LoggingSettings> settings, IScopeProvider scopeProvider, IProfilingLogger pLogger, ILogger<LogScrubber> logger)
IMainDom mainDom, IServerRegistrar serverRegistrar, IAuditService auditService, IOptions<LoggingSettings> settings, IScopeProvider scopeProvider, IProfilingLogger profilingLogger , ILogger<LogScrubber> logger)
: base(runner, delayMilliseconds, periodMilliseconds)
{
_mainDom = mainDom;
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Scheduling
_auditService = auditService;
_settings = settings.Value;
_scopeProvider = scopeProvider;
_pLogger = pLogger;
_profilingLogger = profilingLogger ;
_logger = logger;
}
@@ -78,7 +78,7 @@ namespace Umbraco.Web.Scheduling
// Ensure we use an explicit scope since we are running on a background thread.
using (var scope = _scopeProvider.CreateScope())
using (_pLogger.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
using (_profilingLogger.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
{
_auditService.CleanLogs(GetLogScrubbingMaximumAge(_settings));
scope.Complete();

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

@@ -31,7 +31,7 @@ namespace Umbraco.Web.Scheduling
private readonly IServerRegistrar _serverRegistrar;
private readonly IContentService _contentService;
private readonly IAuditService _auditService;
private readonly IProfilingLogger _pLogger;
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<SchedulerComponent> _logger;
private readonly ILoggerFactory _loggerFactory;
private readonly IApplicationShutdownRegistry _applicationShutdownRegistry;
@@ -60,7 +60,7 @@ namespace Umbraco.Web.Scheduling
public SchedulerComponent(IRuntimeState runtime, IMainDom mainDom, IServerRegistrar serverRegistrar,
IContentService contentService, IAuditService auditService,
HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger pLogger, ILoggerFactory loggerFactory,
IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger profilingLogger , ILoggerFactory loggerFactory,
IApplicationShutdownRegistry applicationShutdownRegistry, IOptions<HealthChecksSettings> healthChecksSettings,
IServerMessenger serverMessenger, IRequestAccessor requestAccessor,
IOptions<LoggingSettings> loggingSettings, IOptions<KeepAliveSettings> keepAliveSettings,
@@ -73,7 +73,7 @@ namespace Umbraco.Web.Scheduling
_contentService = contentService;
_auditService = auditService;
_scopeProvider = scopeProvider;
_pLogger = pLogger;
_profilingLogger = profilingLogger ;
_loggerFactory = loggerFactory;
_logger = loggerFactory.CreateLogger<SchedulerComponent>();
_applicationShutdownRegistry = applicationShutdownRegistry;
@@ -140,7 +140,7 @@ namespace Umbraco.Web.Scheduling
var healthCheckConfig = _healthChecksSettings;
if (healthCheckConfig.NotificationSettings.Enabled)
tasks.Add(RegisterHealthCheckNotifier(healthCheckConfig, _healthChecks, _notifications, _pLogger));
tasks.Add(RegisterHealthCheckNotifier(healthCheckConfig, _healthChecks, _notifications, _profilingLogger));
return tasks.ToArray();
});
@@ -150,7 +150,7 @@ namespace Umbraco.Web.Scheduling
{
// ping/keepalive
// on all servers
var task = new KeepAlive(_keepAliveRunner, DefaultDelayMilliseconds, FiveMinuteMilliseconds, _requestAccessor, _mainDom, Options.Create(keepAliveSettings), _loggerFactory.CreateLogger<KeepAlive>(), _pLogger, _serverRegistrar);
var task = new KeepAlive(_keepAliveRunner, DefaultDelayMilliseconds, FiveMinuteMilliseconds, _requestAccessor, _mainDom, Options.Create(keepAliveSettings), _loggerFactory.CreateLogger<KeepAlive>(), _profilingLogger, _serverRegistrar);
_keepAliveRunner.TryAdd(task);
return task;
}
@@ -194,7 +194,7 @@ namespace Umbraco.Web.Scheduling
{
// log scrubbing
// install on all, will only run on non-replica servers
var task = new LogScrubber(_scrubberRunner, DefaultDelayMilliseconds, LogScrubber.GetLogScrubbingInterval(), _mainDom, _serverRegistrar, _auditService, Options.Create(settings), _scopeProvider, _pLogger, _loggerFactory.CreateLogger<LogScrubber>());
var task = new LogScrubber(_scrubberRunner, DefaultDelayMilliseconds, LogScrubber.GetLogScrubbingInterval(), _mainDom, _serverRegistrar, _auditService, Options.Create(settings), _scopeProvider, _profilingLogger, _loggerFactory.CreateLogger<LogScrubber>());
_scrubberRunner.TryAdd(task);
return task;
}
@@ -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, _profilingLogger, _loggerFactory.CreateLogger<TempFileCleanup>());
_scrubberRunner.TryAdd(task);
return task;
}

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

@@ -19,16 +19,16 @@ namespace Umbraco.Web.Search
private readonly IndexRebuilder _indexRebuilder;
private readonly IMainDom _mainDom;
// TODO: Remove unused ProfilingLogger?
private readonly IProfilingLogger _pLogger;
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<BackgroundIndexRebuilder> _logger;
private readonly ILoggerFactory _loggerFactory;
private readonly IApplicationShutdownRegistry _hostingEnvironment;
private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger pLogger, ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder)
public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger profilingLogger , ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder)
{
_mainDom = mainDom;
_pLogger = pLogger;
_profilingLogger = profilingLogger ;
_loggerFactory = loggerFactory;
_logger = loggerFactory.CreateLogger<BackgroundIndexRebuilder>();
_hostingEnvironment = hostingEnvironment;

6
src/Umbraco.Infrastructure/Search/ExamineComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Web.Search
private readonly IScopeProvider _scopeProvider;
private readonly ServiceContext _services;
private readonly IMainDom _mainDom;
private readonly IProfilingLogger _pLogger;
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<ExamineComponent> _logger;
private readonly IUmbracoIndexesCreator _indexCreator;
private readonly BackgroundTaskRunner<IBackgroundTask> _indexItemTaskRunner;
@@ -63,7 +63,7 @@ namespace Umbraco.Web.Search
_memberValueSetBuilder = memberValueSetBuilder;
_backgroundIndexRebuilder = backgroundIndexRebuilder;
_mainDom = mainDom;
_pLogger = profilingLogger;
_profilingLogger = profilingLogger;
_logger = loggerFactory.CreateLogger<ExamineComponent>();
_indexCreator = indexCreator;
_indexItemTaskRunner = new BackgroundTaskRunner<IBackgroundTask>(loggerFactory.CreateLogger<BackgroundTaskRunner<IBackgroundTask>>(), applicationShutdownRegistry);
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Search
//let's deal with shutting down Examine with MainDom
var examineShutdownRegistered = _mainDom.Register(() =>
{
using (_pLogger.TraceDuration<ExamineComponent>("Examine shutting down"))
using (_profilingLogger.TraceDuration<ExamineComponent>("Examine shutting down"))
{
_examineManager.Dispose();
}

4
src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs
View File

@@ -90,8 +90,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, ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder)
: base(mainDom, pLogger, loggerFactory, hostingEnvironment, indexRebuilder)
public TestBackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger profilingLogger , ILoggerFactory loggerFactory, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder)
: base(mainDom, profilingLogger , loggerFactory, hostingEnvironment, indexRebuilder)
{
}

6
src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
View File

@@ -48,11 +48,11 @@ namespace Umbraco.Tests.PublishedContent
Composition.RegisterUnique<IPublishedModelFactory>(f => new PublishedModelFactory(f.GetInstance<TypeLoader>().GetTypes<PublishedContentModel>(), f.GetInstance<IPublishedValueFallback>()));
}
protected override TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger pLogger, IHostingEnvironment hostingEnvironment)
protected override TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger profilingLogger , IHostingEnvironment hostingEnvironment)
{
var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, pLogger, hostingEnvironment);
var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, profilingLogger , hostingEnvironment);
return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, pLogger, false,
return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, profilingLogger , false,
// this is so the model factory looks into the test assembly
baseLoader.AssembliesToScan
.Union(new[] {typeof(PublishedContentMoreTests).Assembly})

6
src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
View File

@@ -97,11 +97,11 @@ namespace Umbraco.Tests.PublishedContent
}
protected override TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger pLogger, IHostingEnvironment hostingEnvironment)
protected override TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger profilingLogger , IHostingEnvironment hostingEnvironment)
{
var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, pLogger, hostingEnvironment);
var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, profilingLogger , hostingEnvironment);
return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, pLogger, false,
return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, profilingLogger , false,
// this is so the model factory looks into the test assembly
baseLoader.AssembliesToScan
.Union(new[] { typeof(PublishedContentTests).Assembly })

3
src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Linq;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using Newtonsoft.Json;
@@ -190,7 +191,7 @@ namespace Umbraco.Tests.Routing
var propertyValueConverters = new PropertyValueConverterCollection(new IPropertyValueConverter[]
{
new UploadPropertyConverter(),
new ImageCropperValueConverter(),
new ImageCropperValueConverter(Mock.Of<ILogger<ImageCropperValueConverter>>()),
});
var publishedModelFactory = Mock.Of<IPublishedModelFactory>();

4
src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
View File

@@ -105,14 +105,14 @@ namespace Umbraco.Tests.Testing.TestingTests
[Test]
public void Can_Mock_UmbracoApiController_Dependencies_With_Injected_UmbracoMapper()
{
var pLogger = Mock.Of<IProfilingLogger>();
var profilingLogger = Mock.Of<IProfilingLogger>();
var memberService = Mock.Of<IMemberService>();
var memberTypeService = Mock.Of<IMemberTypeService>();
var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of<IUmbracoVersion>(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver());
var membershipHelper = new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), membershipProvider, Mock.Of<RoleProvider>(), memberService, memberTypeService, Mock.Of<IPublicAccessService>(), AppCaches.Disabled, NullLoggerFactory.Instance, ShortStringHelper, Mock.Of<IEntityService>());
var umbracoMapper = new UmbracoMapper(new MapDefinitionCollection(new[] { Mock.Of<IMapDefinition>() }));
var umbracoApiController = new FakeUmbracoApiController(new GlobalSettings(), Mock.Of<IUmbracoContextAccessor>(), Mock.Of<ISqlContext>(), ServiceContext.CreatePartial(), AppCaches.NoCache, pLogger, Mock.Of<IRuntimeState>(), umbracoMapper, Mock.Of<IPublishedUrlProvider>());
var umbracoApiController = new FakeUmbracoApiController(new GlobalSettings(), Mock.Of<IUmbracoContextAccessor>(), Mock.Of<ISqlContext>(), ServiceContext.CreatePartial(), AppCaches.NoCache, profilingLogger , Mock.Of<IRuntimeState>(), umbracoMapper, Mock.Of<IPublishedUrlProvider>());
Assert.Pass();
}

16
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -386,30 +386,30 @@ namespace Umbraco.Tests.Testing
.ComposeCoreMappingProfiles();
}
protected virtual TypeLoader GetTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IHostingEnvironment hostingEnvironment, ILogger<TypeLoader> logger, IProfilingLogger pLogger, UmbracoTestOptions.TypeLoader option)
protected virtual TypeLoader GetTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IHostingEnvironment hostingEnvironment, ILogger<TypeLoader> logger, IProfilingLogger profilingLogger , UmbracoTestOptions.TypeLoader option)
{
switch (option)
{
case UmbracoTestOptions.TypeLoader.Default:
return _commonTypeLoader ?? (_commonTypeLoader = CreateCommonTypeLoader(typeFinder, runtimeCache, logger, pLogger, hostingEnvironment));
return _commonTypeLoader ?? (_commonTypeLoader = CreateCommonTypeLoader(typeFinder, runtimeCache, logger, profilingLogger , hostingEnvironment));
case UmbracoTestOptions.TypeLoader.PerFixture:
return _featureTypeLoader ?? (_featureTypeLoader = CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, pLogger, hostingEnvironment));
return _featureTypeLoader ?? (_featureTypeLoader = CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, profilingLogger , hostingEnvironment));
case UmbracoTestOptions.TypeLoader.PerTest:
return CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, pLogger, hostingEnvironment);
return CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, profilingLogger , hostingEnvironment);
default:
throw new ArgumentOutOfRangeException(nameof(option));
}
}
protected virtual TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger pLogger, IHostingEnvironment hostingEnvironment)
protected virtual TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger profilingLogger , IHostingEnvironment hostingEnvironment)
{
return CreateCommonTypeLoader(typeFinder, runtimeCache, logger, pLogger, hostingEnvironment);
return CreateCommonTypeLoader(typeFinder, runtimeCache, logger, profilingLogger , hostingEnvironment);
}
// common to all tests = cannot be overriden
private static TypeLoader CreateCommonTypeLoader(ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger pLogger, IHostingEnvironment hostingEnvironment)
private static TypeLoader CreateCommonTypeLoader(ITypeFinder typeFinder, IAppPolicyCache runtimeCache, ILogger<TypeLoader> logger, IProfilingLogger profilingLogger , IHostingEnvironment hostingEnvironment)
{
return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, pLogger, false, new[]
return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, profilingLogger , false, new[]
{
Assembly.Load("Umbraco.Core"),
Assembly.Load("Umbraco.Web"),

10
src/Umbraco.Web.Common/Macros/MacroRenderer.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Web.Macros
{
public class MacroRenderer : IMacroRenderer
{
private readonly IProfilingLogger _plogger;
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<MacroRenderer> _logger;
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
private readonly ContentSettings _contentSettings;
@@ -37,7 +37,7 @@ namespace Umbraco.Web.Macros
private readonly IHttpContextAccessor _httpContextAccessor;
public MacroRenderer(
IProfilingLogger plogger,
IProfilingLogger profilingLogger ,
ILogger<MacroRenderer> logger,
IUmbracoContextAccessor umbracoContextAccessor,
IOptions<ContentSettings> contentSettings,
@@ -51,7 +51,7 @@ namespace Umbraco.Web.Macros
IRequestAccessor requestAccessor,
IHttpContextAccessor httpContextAccessor)
{
_plogger = plogger ?? throw new ArgumentNullException(nameof(plogger));
_profilingLogger = profilingLogger ?? throw new ArgumentNullException(nameof(profilingLogger ));
_logger = logger;
_umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
_contentSettings = contentSettings.Value ?? throw new ArgumentNullException(nameof(contentSettings));
@@ -223,7 +223,7 @@ namespace Umbraco.Web.Macros
if (content == null) throw new ArgumentNullException(nameof(content));
var macroInfo = $"Render Macro: {macro.Name}, cache: {macro.CacheDuration}";
using (_plogger.DebugDuration<MacroRenderer>(macroInfo, "Rendered Macro."))
using (_profilingLogger.DebugDuration<MacroRenderer>(macroInfo, "Rendered Macro."))
{
// parse macro parameters ie replace the special [#key], [$key], etc. syntaxes
foreach (var prop in macro.Properties)
@@ -269,7 +269,7 @@ namespace Umbraco.Web.Macros
/// </summary>
private Attempt<MacroContent> ExecuteMacroWithErrorWrapper(MacroModel macro, string msgIn, string msgOut, Func<MacroContent> getMacroContent, Func<string> msgErr)
{
using (_plogger.DebugDuration<MacroRenderer>(msgIn, msgOut))
using (_profilingLogger.DebugDuration<MacroRenderer>(msgIn, msgOut))
{
return ExecuteProfileMacroWithErrorWrapper(macro, msgIn, getMacroContent, msgErr);
}

4
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -63,7 +63,7 @@ namespace Umbraco.Web.Editors
ISqlContext sqlContext,
ServiceContext services,
AppCaches appCaches,
IProfilingLogger pLogger,
IProfilingLogger profilingLogger ,
ILogger<AuthenticationController> logger,
IRuntimeState runtimeState,
UmbracoMapper umbracoMapper,
@@ -71,7 +71,7 @@ namespace Umbraco.Web.Editors
IPublishedUrlProvider publishedUrlProvider,
IRequestAccessor requestAccessor,
IEmailSender emailSender)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, pLogger, runtimeState, umbracoMapper, publishedUrlProvider)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, profilingLogger , runtimeState, umbracoMapper, publishedUrlProvider)
{
_passwordConfiguration = passwordConfiguration ?? throw new ArgumentNullException(nameof(passwordConfiguration));
_hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));

10
src/Umbraco.Web/Macros/MacroRenderer.cs
View File

@@ -21,7 +21,7 @@ namespace Umbraco.Web.Macros
{
internal class MacroRenderer : IMacroRenderer
{
private readonly IProfilingLogger _plogger;
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<MacroRenderer> _logger;
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
private readonly ContentSettings _contentSettings;
@@ -37,7 +37,7 @@ namespace Umbraco.Web.Macros
public MacroRenderer(
IProfilingLogger plogger,
IProfilingLogger profilingLogger ,
ILogger<MacroRenderer> logger,
IUmbracoContextAccessor umbracoContextAccessor,
IOptions<ContentSettings> contentSettings,
@@ -51,7 +51,7 @@ namespace Umbraco.Web.Macros
IRequestAccessor requestAccessor,
IHttpContextAccessor httpContextAccessor)
{
_plogger = plogger ?? throw new ArgumentNullException(nameof(plogger));
_profilingLogger = profilingLogger ?? throw new ArgumentNullException(nameof(profilingLogger ));
_logger = logger;
_umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
_contentSettings = contentSettings.Value ?? throw new ArgumentNullException(nameof(contentSettings));
@@ -223,7 +223,7 @@ namespace Umbraco.Web.Macros
if (content == null) throw new ArgumentNullException(nameof(content));
var macroInfo = $"Render Macro: {macro.Name}, cache: {macro.CacheDuration}";
using (_plogger.DebugDuration<MacroRenderer>(macroInfo, "Rendered Macro."))
using (_profilingLogger.DebugDuration<MacroRenderer>(macroInfo, "Rendered Macro."))
{
// parse macro parameters ie replace the special [#key], [$key], etc. syntaxes
foreach (var prop in macro.Properties)
@@ -269,7 +269,7 @@ namespace Umbraco.Web.Macros
/// </summary>
private Attempt<MacroContent> ExecuteMacroWithErrorWrapper(MacroModel macro, string msgIn, string msgOut, Func<MacroContent> getMacroContent, Func<string> msgErr)
{
using (_plogger.DebugDuration<MacroRenderer>(msgIn, msgOut))
using (_profilingLogger.DebugDuration<MacroRenderer>(msgIn, msgOut))
{
return ExecuteProfileMacroWithErrorWrapper(macro, msgIn, getMacroContent, msgErr);
}

4
src/Umbraco.Web/UmbracoHttpHandler.cs
View File

@@ -18,11 +18,11 @@ namespace Umbraco.Web
: this(Current.UmbracoContextAccessor, Current.Services, Current.Logger, Current.ProfilingLogger)
{ }
protected UmbracoHttpHandler(IUmbracoContextAccessor umbracoContextAccessor,ServiceContext service, ILogger logger, IProfilingLogger plogger)
protected UmbracoHttpHandler(IUmbracoContextAccessor umbracoContextAccessor,ServiceContext service, ILogger logger, IProfilingLogger profilingLogger )
{
UmbracoContextAccessor = umbracoContextAccessor;
Logger = logger;
ProfilingLogger = plogger;
ProfilingLogger = profilingLogger ;
Services = service;
}