diff --git a/src/Umbraco.Core/ContentApps/ContentInfoContentAppFactory.cs b/src/Umbraco.Core/ContentApps/ContentInfoContentAppFactory.cs index 56774d652d..abad7f4bf8 100644 --- a/src/Umbraco.Core/ContentApps/ContentInfoContentAppFactory.cs +++ b/src/Umbraco.Core/ContentApps/ContentInfoContentAppFactory.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.ContentApps return _contentApp ?? (_contentApp = new ContentApp { Alias = "umbInfo", - Name = "LogInformation", + Name = "Info", Icon = "icon-info", View = "views/content/apps/info/info.html", Weight = Weight @@ -33,7 +33,7 @@ namespace Umbraco.Web.ContentApps return _mediaApp ?? (_mediaApp = new ContentApp { Alias = "umbInfo", - Name = "LogInformation", + Name = "Info", Icon = "icon-info", View = "views/media/apps/info/info.html", Weight = Weight @@ -42,7 +42,7 @@ namespace Umbraco.Web.ContentApps return _memberApp ?? (_memberApp = new ContentApp { Alias = "umbInfo", - Name = "LogInformation", + Name = "Info", Icon = "icon-info", View = "views/member/apps/info/info.html", Weight = Weight diff --git a/src/Umbraco.Core/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs index 75a43c068f..2ff0e88281 100644 --- a/src/Umbraco.Core/IO/FileSystems.cs +++ b/src/Umbraco.Core/IO/FileSystems.cs @@ -130,11 +130,12 @@ namespace Umbraco.Core.IO // but it does not really matter what we return - here, null private object CreateWellKnownFileSystems() { - var macroPartialFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger(), Constants.SystemDirectories.MacroPartials); - var partialViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger(), Constants.SystemDirectories.PartialViews); - var stylesheetsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger(), _globalSettings.UmbracoCssPath); - var scriptsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger(), _globalSettings.UmbracoScriptsPath); - var mvcViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger(), Constants.SystemDirectories.MvcViews); + var logger = _loggerFactory.CreateLogger(); + var macroPartialFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, Constants.SystemDirectories.MacroPartials); + var partialViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, Constants.SystemDirectories.PartialViews); + var stylesheetsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, _globalSettings.UmbracoCssPath); + var scriptsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, _globalSettings.UmbracoScriptsPath); + var mvcViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, Constants.SystemDirectories.MvcViews); _macroPartialFileSystem = new ShadowWrapper(macroPartialFileSystem, _ioHelper, _hostingEnvironment, _loggerFactory,"macro-partials", IsScoped); _partialViewsFileSystem = new ShadowWrapper(partialViewsFileSystem, _ioHelper, _hostingEnvironment, _loggerFactory,"partials", IsScoped); diff --git a/src/Umbraco.Core/Logging/DisposableTimer.cs b/src/Umbraco.Core/Logging/DisposableTimer.cs index a076d15fae..9fdb93c057 100644 --- a/src/Umbraco.Core/Logging/DisposableTimer.cs +++ b/src/Umbraco.Core/Logging/DisposableTimer.cs @@ -9,7 +9,7 @@ namespace Umbraco.Core.Logging /// public class DisposableTimer : DisposableObjectSlim { - private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly ILogger _logger; private readonly LogLevel _level; private readonly Type _loggerType; private readonly int _thresholdMilliseconds; @@ -21,7 +21,7 @@ namespace Umbraco.Core.Logging private readonly string _timingId; // internal - created by profiling logger - internal DisposableTimer(Microsoft.Extensions.Logging.ILogger logger, LogLevel level, IProfiler profiler, Type loggerType, + internal DisposableTimer(ILogger logger, LogLevel level, IProfiler profiler, Type loggerType, string startMessage, string endMessage, string failMessage = null, int thresholdMilliseconds = 0) { diff --git a/src/Umbraco.Core/Logging/LogProfiler.cs b/src/Umbraco.Core/Logging/LogProfiler.cs index 1c4b17ee8a..047331fd3a 100644 --- a/src/Umbraco.Core/Logging/LogProfiler.cs +++ b/src/Umbraco.Core/Logging/LogProfiler.cs @@ -9,9 +9,9 @@ namespace Umbraco.Core.Logging /// public class LogProfiler : IProfiler { - private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly ILogger _logger; - public LogProfiler(Microsoft.Extensions.Logging.ILogger logger) + public LogProfiler(ILogger logger) { _logger = logger; }