From ca863fce8d3e14356b24e207245127f61b1c329f Mon Sep 17 00:00:00 2001 From: elitsa Date: Tue, 28 Jan 2020 13:32:32 +0100 Subject: [PATCH] Fixing modified method signature, using a magic string rather than using CustomErrorsMode (System.Web.Configuration) --- .../HealthChecks}/AbstractConfigCheck.cs | 8 +++++--- .../HealthChecks}/CompilationDebugCheck.cs | 5 +++-- .../HealthChecks}/ConfigurationService.cs | 11 +++++++---- .../Configuration/HealthChecks}/CustomErrorsCheck.cs | 8 ++++---- .../Configuration/HealthChecks}/MacroErrorsCheck.cs | 5 +++-- .../HealthChecks}/NotificationEmailCheck.cs | 5 +++-- .../Configuration/HealthChecks}/TraceCheck.cs | 5 +++-- 7 files changed, 28 insertions(+), 19 deletions(-) rename src/{Umbraco.Web/HealthCheck/Checks/Config => Umbraco.Abstractions/Configuration/HealthChecks}/AbstractConfigCheck.cs (97%) rename src/{Umbraco.Web/HealthCheck/Checks/Config => Umbraco.Abstractions/Configuration/HealthChecks}/CompilationDebugCheck.cs (92%) rename src/{Umbraco.Web/HealthCheck/Checks/Config => Umbraco.Abstractions/Configuration/HealthChecks}/ConfigurationService.cs (90%) rename src/{Umbraco.Web/HealthCheck/Checks/Config => Umbraco.Abstractions/Configuration/HealthChecks}/CustomErrorsCheck.cs (92%) rename src/{Umbraco.Web/HealthCheck/Checks/Config => Umbraco.Abstractions/Configuration/HealthChecks}/MacroErrorsCheck.cs (95%) rename src/{Umbraco.Web/HealthCheck/Checks/Config => Umbraco.Abstractions/Configuration/HealthChecks}/NotificationEmailCheck.cs (91%) rename src/{Umbraco.Web/HealthCheck/Checks/Config => Umbraco.Abstractions/Configuration/HealthChecks}/TraceCheck.cs (92%) diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs b/src/Umbraco.Abstractions/Configuration/HealthChecks/AbstractConfigCheck.cs similarity index 97% rename from src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs rename to src/Umbraco.Abstractions/Configuration/HealthChecks/AbstractConfigCheck.cs index 41f0434360..6f665902c4 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/AbstractConfigCheck.cs +++ b/src/Umbraco.Abstractions/Configuration/HealthChecks/AbstractConfigCheck.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Umbraco.Core.IO; -using Umbraco.Web.Composing; +using Umbraco.Core.Logging; using Umbraco.Core.Services; namespace Umbraco.Web.HealthCheck.Checks.Config @@ -14,6 +14,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config protected ILocalizedTextService TextService { get; } protected IIOHelper IOHelper { get; } + protected ILogger Logger { get; } /// /// Gets the config file path. @@ -53,11 +54,12 @@ namespace Umbraco.Web.HealthCheck.Checks.Config get { return false; } } - protected AbstractConfigCheck(ILocalizedTextService textService, IIOHelper ioHelper) + protected AbstractConfigCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger) { TextService = textService; IOHelper = ioHelper; - _configurationService = new ConfigurationService(AbsoluteFilePath, XPath, textService); + Logger = logger; + _configurationService = new ConfigurationService(AbsoluteFilePath, XPath, textService, logger); } /// diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/CompilationDebugCheck.cs b/src/Umbraco.Abstractions/Configuration/HealthChecks/CompilationDebugCheck.cs similarity index 92% rename from src/Umbraco.Web/HealthCheck/Checks/Config/CompilationDebugCheck.cs rename to src/Umbraco.Abstractions/Configuration/HealthChecks/CompilationDebugCheck.cs index 47c7adc694..b34c600342 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/CompilationDebugCheck.cs +++ b/src/Umbraco.Abstractions/Configuration/HealthChecks/CompilationDebugCheck.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Umbraco.Core.IO; +using Umbraco.Core.Logging; using Umbraco.Core.Services; namespace Umbraco.Web.HealthCheck.Checks.Config @@ -9,8 +10,8 @@ namespace Umbraco.Web.HealthCheck.Checks.Config Group = "Live Environment")] public class CompilationDebugCheck : AbstractConfigCheck { - public CompilationDebugCheck(ILocalizedTextService textService, IIOHelper ioHelper) - : base(textService, ioHelper) + public CompilationDebugCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger) + : base(textService, ioHelper, logger) { } public override string FilePath => "~/Web.config"; diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs b/src/Umbraco.Abstractions/Configuration/HealthChecks/ConfigurationService.cs similarity index 90% rename from src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs rename to src/Umbraco.Abstractions/Configuration/HealthChecks/ConfigurationService.cs index 95b458b142..a4554a52fd 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/ConfigurationService.cs +++ b/src/Umbraco.Abstractions/Configuration/HealthChecks/ConfigurationService.cs @@ -3,7 +3,6 @@ using System.IO; using System.Xml; using Umbraco.Core.Logging; using Umbraco.Core.Services; -using Umbraco.Web.Composing; namespace Umbraco.Web.HealthCheck.Checks.Config { @@ -14,15 +13,19 @@ namespace Umbraco.Web.HealthCheck.Checks.Config private readonly string _configFilePath; private readonly string _xPath; private readonly ILocalizedTextService _textService; + private readonly ILogger _logger; /// The absolute file location of the configuration file /// The XPath to select the value + /// + /// /// - public ConfigurationService(string configFilePath, string xPath, ILocalizedTextService textService) + public ConfigurationService(string configFilePath, string xPath, ILocalizedTextService textService, ILogger logger) { _configFilePath = configFilePath; _xPath = xPath; _textService = textService; + _logger = logger; } /// @@ -58,7 +61,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config } catch (Exception ex) { - Current.Logger.Error(ex, "Error trying to get configuration value"); + _logger.Error(ex, "Error trying to get configuration value"); return new ConfigurationServiceResult { Success = false, @@ -104,7 +107,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config } catch (Exception ex) { - Current.Logger.Error(ex, "Error trying to update configuration"); + _logger.Error(ex, "Error trying to update configuration"); return new ConfigurationServiceResult { Success = false, diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/CustomErrorsCheck.cs b/src/Umbraco.Abstractions/Configuration/HealthChecks/CustomErrorsCheck.cs similarity index 92% rename from src/Umbraco.Web/HealthCheck/Checks/Config/CustomErrorsCheck.cs rename to src/Umbraco.Abstractions/Configuration/HealthChecks/CustomErrorsCheck.cs index 0a34390ed2..57bf36b2b9 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/CustomErrorsCheck.cs +++ b/src/Umbraco.Abstractions/Configuration/HealthChecks/CustomErrorsCheck.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -using System.Web.Configuration; using Umbraco.Core.IO; +using Umbraco.Core.Logging; using Umbraco.Core.Services; namespace Umbraco.Web.HealthCheck.Checks.Config @@ -11,8 +11,8 @@ namespace Umbraco.Web.HealthCheck.Checks.Config Group = "Live Environment")] public class CustomErrorsCheck : AbstractConfigCheck { - public CustomErrorsCheck(ILocalizedTextService textService, IIOHelper ioHelper) - : base(textService, ioHelper) + public CustomErrorsCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger) + : base(textService, ioHelper, logger) { } public override string FilePath => "~/Web.config"; @@ -23,7 +23,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config public override IEnumerable Values => new List { - new AcceptableConfiguration { IsRecommended = true, Value = CustomErrorsMode.RemoteOnly.ToString() }, + new AcceptableConfiguration { IsRecommended = true, Value = "RemoteOnly" }, new AcceptableConfiguration { IsRecommended = false, Value = "On" } }; diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/MacroErrorsCheck.cs b/src/Umbraco.Abstractions/Configuration/HealthChecks/MacroErrorsCheck.cs similarity index 95% rename from src/Umbraco.Web/HealthCheck/Checks/Config/MacroErrorsCheck.cs rename to src/Umbraco.Abstractions/Configuration/HealthChecks/MacroErrorsCheck.cs index d23a12fdd3..2c152907d9 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/MacroErrorsCheck.cs +++ b/src/Umbraco.Abstractions/Configuration/HealthChecks/MacroErrorsCheck.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Core.IO; +using Umbraco.Core.Logging; using Umbraco.Core.Services; namespace Umbraco.Web.HealthCheck.Checks.Config @@ -10,8 +11,8 @@ namespace Umbraco.Web.HealthCheck.Checks.Config Group = "Configuration")] public class MacroErrorsCheck : AbstractConfigCheck { - public MacroErrorsCheck(ILocalizedTextService textService, IIOHelper ioHelper) - : base(textService, ioHelper) + public MacroErrorsCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger) + : base(textService, ioHelper, logger) { } public override string FilePath => "~/Config/umbracoSettings.config"; diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs b/src/Umbraco.Abstractions/Configuration/HealthChecks/NotificationEmailCheck.cs similarity index 91% rename from src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs rename to src/Umbraco.Abstractions/Configuration/HealthChecks/NotificationEmailCheck.cs index 3630597573..a46ec5d8a1 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/NotificationEmailCheck.cs +++ b/src/Umbraco.Abstractions/Configuration/HealthChecks/NotificationEmailCheck.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Umbraco.Core.IO; +using Umbraco.Core.Logging; using Umbraco.Core.Services; namespace Umbraco.Web.HealthCheck.Checks.Config @@ -11,8 +12,8 @@ namespace Umbraco.Web.HealthCheck.Checks.Config { private const string DefaultFromEmail = "your@email.here"; - public NotificationEmailCheck(ILocalizedTextService textService, IIOHelper ioHelper) - : base(textService, ioHelper) + public NotificationEmailCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger) + : base(textService, ioHelper, logger) { } public override string FilePath => "~/Config/umbracoSettings.config"; diff --git a/src/Umbraco.Web/HealthCheck/Checks/Config/TraceCheck.cs b/src/Umbraco.Abstractions/Configuration/HealthChecks/TraceCheck.cs similarity index 92% rename from src/Umbraco.Web/HealthCheck/Checks/Config/TraceCheck.cs rename to src/Umbraco.Abstractions/Configuration/HealthChecks/TraceCheck.cs index 24c9577c29..ffd359f497 100644 --- a/src/Umbraco.Web/HealthCheck/Checks/Config/TraceCheck.cs +++ b/src/Umbraco.Abstractions/Configuration/HealthChecks/TraceCheck.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Umbraco.Core.IO; +using Umbraco.Core.Logging; using Umbraco.Core.Services; namespace Umbraco.Web.HealthCheck.Checks.Config @@ -10,8 +11,8 @@ namespace Umbraco.Web.HealthCheck.Checks.Config public class TraceCheck : AbstractConfigCheck { - public TraceCheck(ILocalizedTextService textService, IIOHelper ioHelper) - : base(textService, ioHelper) + public TraceCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger) + : base(textService, ioHelper, logger) { } public override string FilePath => "~/Web.config";