Start using LoggerFactory

src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs

@@ -16,7 +16,8 @@ namespace Umbraco.Web.Scheduling
         private readonly HealthCheckCollection _healthChecks;
         private readonly HealthCheckNotificationMethodCollection _notifications;
         private readonly IScopeProvider _scopeProvider;
-        private readonly IProfilingLogger _logger;
+        private readonly IProfilingLogger _pLogger;
+        private readonly ILogger _logger;
         private readonly IHealthChecksSettings _healthChecksSettingsConfig;
         private readonly IServerRegistrar _serverRegistrar;
         private readonly IRuntimeState _runtimeState;
@@ -28,7 +29,8 @@ namespace Umbraco.Web.Scheduling
             HealthCheckCollection healthChecks,
             HealthCheckNotificationMethodCollection notifications,
             IMainDom mainDom,
-            IProfilingLogger logger,
+            IProfilingLogger pLogger,
+            ILogger logger,
             IHealthChecksSettings healthChecksSettingsConfig,
             IServerRegistrar serverRegistrar,
             IRuntimeState runtimeState,
@@ -40,6 +42,7 @@ namespace Umbraco.Web.Scheduling
             _mainDom = mainDom;
             _scopeProvider = scopeProvider;
             _runtimeState = runtimeState;
+            _pLogger = pLogger;
             _logger = logger;
             _healthChecksSettingsConfig = healthChecksSettingsConfig;
             _serverRegistrar = serverRegistrar;
@@ -54,17 +57,17 @@ namespace Umbraco.Web.Scheduling
             switch (_serverRegistrar.GetCurrentServerRole())
             {
                 case ServerRole.Replica:
-                    _logger.Debug<HealthCheckNotifier>("Does not run on replica servers.");
+                    _logger.LogDebug("Does not run on replica servers.");
                     return true; // DO repeat, server role can change
                 case ServerRole.Unknown:
-                    _logger.Debug<HealthCheckNotifier>("Does not run on servers with unknown role.");
+                    _logger.LogDebug("Does not run on servers with unknown role.");
                     return true; // DO repeat, server role can change
             }
 
             // ensure we do not run if not main domain, but do NOT lock it
             if (_mainDom.IsMainDom == false)
             {
-                _logger.Debug<HealthCheckNotifier>("Does not run if not MainDom.");
+                _logger.LogDebug("Does not run if not MainDom.");
                 return false; // do NOT repeat, going down
             }
 
@@ -72,7 +75,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 (_logger.DebugDuration<HealthCheckNotifier>("Health checks executing", "Health checks complete"))
+            using (_pLogger.DebugDuration<HealthCheckNotifier>("Health checks executing", "Health checks complete"))
             {
                 var healthCheckConfig = _healthChecksSettingsConfig;
 

src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs

@@ -15,11 +15,12 @@ namespace Umbraco.Web.Scheduling
         private readonly IServerRegistrar _serverRegistrar;
         private readonly IAuditService _auditService;
         private readonly ILoggingSettings _settings;
-        private readonly IProfilingLogger _logger;
+        private readonly IProfilingLogger _pLogger;
+        private readonly ILogger _logger;
         private readonly IScopeProvider _scopeProvider;
 
         public LogScrubber(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-            IMainDom mainDom, IServerRegistrar serverRegistrar, IAuditService auditService, ILoggingSettings settings, IScopeProvider scopeProvider, IProfilingLogger logger)
+            IMainDom mainDom, IServerRegistrar serverRegistrar, IAuditService auditService, ILoggingSettings settings, IScopeProvider scopeProvider, IProfilingLogger pLogger, ILogger logger)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _mainDom = mainDom;
@@ -27,6 +28,7 @@ namespace Umbraco.Web.Scheduling
             _auditService = auditService;
             _settings = settings;
             _scopeProvider = scopeProvider;
+            _pLogger = pLogger;
             _logger = logger;
         }
 
@@ -41,7 +43,7 @@ namespace Umbraco.Web.Scheduling
             }
             catch (Exception ex)
             {
-                _logger.LogError<LogScrubber>(ex, "Unable to locate a log scrubbing maximum age. Defaulting to 24 hours.");
+                _logger.LogError(ex, "Unable to locate a log scrubbing maximum age. Defaulting to 24 hours.");
             }
             return maximumAge;
 
@@ -58,23 +60,23 @@ namespace Umbraco.Web.Scheduling
             switch (_serverRegistrar.GetCurrentServerRole())
             {
                 case ServerRole.Replica:
-                    _logger.Debug<LogScrubber>("Does not run on replica servers.");
+                    _logger.LogDebug("Does not run on replica servers.");
                     return true; // DO repeat, server role can change
                 case ServerRole.Unknown:
-                    _logger.Debug<LogScrubber>("Does not run on servers with unknown role.");
+                    _logger.LogDebug("Does not run on servers with unknown role.");
                     return true; // DO repeat, server role can change
             }
 
             // ensure we do not run if not main domain, but do NOT lock it
             if (_mainDom.IsMainDom == false)
             {
-                _logger.Debug<LogScrubber>("Does not run if not MainDom.");
+                _logger.LogDebug("Does not run if not MainDom.");
                 return false; // do NOT repeat, going down
             }
 
             // Ensure we use an explicit scope since we are running on a background thread.
             using (var scope = _scopeProvider.CreateScope())
-            using (_logger.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
+            using (_pLogger.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
             {
                 _auditService.CleanLogs(GetLogScrubbingMaximumAge(_settings));
                 scope.Complete();