diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ExternalLoggerElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ExternalLoggerElement.cs deleted file mode 100644 index 00cf29a751..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/ExternalLoggerElement.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class ExternalLoggerElement : ConfigurationElement - { - [ConfigurationProperty("assembly")] - internal string Assembly - { - get { return (string)base["assembly"]; } - } - - [ConfigurationProperty("type")] - internal string Type - { - get { return (string)base["type"]; } - } - - [ConfigurationProperty("logAuditTrail")] - internal bool LogAuditTrail - { - get { return (bool)base["logAuditTrail"]; } - } - } -} diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs index 220f4b9d5b..6c1be8ade5 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs @@ -4,14 +4,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings { public interface ILoggingSection : IUmbracoConfigurationSection { - bool AutoCleanLogs { get; } - - bool EnableLogging { get; } - - int CleaningMiliseconds { get; } - int MaxLogAge { get; } - - IEnumerable DisabledLogTypes { get; } } } diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs index 7632f241e1..abe10d830e 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/LoggingElement.cs @@ -6,87 +6,16 @@ namespace Umbraco.Core.Configuration.UmbracoSettings internal class LoggingElement : UmbracoConfigurationElement, ILoggingSection { - [ConfigurationProperty("autoCleanLogs")] - internal InnerTextConfigurationElement AutoCleanLogs - { - get { return GetOptionalTextElement("autoCleanLogs", false); } - } - - [ConfigurationProperty("enableLogging")] - internal InnerTextConfigurationElement EnableLogging - { - get { return GetOptionalTextElement("enableLogging", true); } - } - - [ConfigurationProperty("enableAsyncLogging")] - internal InnerTextConfigurationElement EnableAsyncLogging - { - get { return GetOptionalTextElement("enableAsyncLogging", true); } - } - - [ConfigurationProperty("cleaningMiliseconds")] - internal InnerTextConfigurationElement CleaningMiliseconds - { - get { return GetOptionalTextElement("cleaningMiliseconds", -1); } - } - [ConfigurationProperty("maxLogAge")] internal InnerTextConfigurationElement MaxLogAge { get { return GetOptionalTextElement("maxLogAge", -1); } } - - [ConfigurationCollection(typeof(DisabledLogTypesCollection), AddItemName = "logTypeAlias")] - [ConfigurationProperty("disabledLogTypes", IsDefaultCollection = true)] - internal DisabledLogTypesCollection DisabledLogTypes - { - get { return (DisabledLogTypesCollection)base["disabledLogTypes"]; } - } - - [ConfigurationProperty("externalLogger", IsRequired = false)] - internal ExternalLoggerElement ExternalLogger - { - get { return (ExternalLoggerElement) base["externalLogger"]; } - } - - public bool ExternalLoggerIsConfigured - { - get - { - var externalLoggerProperty = Properties["externalLogger"]; - var externalLogger = this[externalLoggerProperty] as ConfigurationElement; - if (externalLogger != null && externalLogger.ElementInformation.IsPresent) - { - return true; - } - return false; - } - } - - bool ILoggingSection.AutoCleanLogs - { - get { return AutoCleanLogs; } - } - - bool ILoggingSection.EnableLogging - { - get { return EnableLogging; } - } - - int ILoggingSection.CleaningMiliseconds - { - get { return CleaningMiliseconds; } - } - + int ILoggingSection.MaxLogAge { get { return MaxLogAge; } } - IEnumerable ILoggingSection.DisabledLogTypes - { - get { return DisabledLogTypes; } - } - } } diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 35ef18d3e8..049ca914d4 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -251,7 +251,6 @@ - diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs index 7eb5a9c4c5..c0819ad828 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs @@ -11,16 +11,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings get { return true; } } - [Test] - public override void DisabledLogTypes() - { - Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.Any() == false); - } - [Test] - public override void CleaningMiliseconds() - { - Assert.IsTrue(SettingsSection.Logging.CleaningMiliseconds == -1); - } [Test] public override void MaxLogAge() { diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs index 2fd32e4a36..31edc87a7c 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs @@ -6,32 +6,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings [TestFixture] public class LoggingElementTests : UmbracoSettingsTests { - [Test] - public void EnableLogging() - { - Assert.IsTrue(SettingsSection.Logging.EnableLogging == true); - } - - [Test] - public virtual void DisabledLogTypes() - { - Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.Count() == 2); - Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.ElementAt(0).LogTypeAlias == "[alias-of-log-type-in-lowercase]"); - Assert.IsTrue(SettingsSection.Logging.DisabledLogTypes.ElementAt(1).LogTypeAlias == "anotherlogalias"); - } - - [Test] - public void AutoCleanLogs() - { - Assert.IsTrue(SettingsSection.Logging.AutoCleanLogs == false); - } - - [Test] - public virtual void CleaningMiliseconds() - { - Assert.IsTrue(SettingsSection.Logging.CleaningMiliseconds == 86400); - - } + [Test] public virtual void MaxLogAge() { diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config index 5367fe3ece..7aeb779e0b 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config @@ -107,16 +107,7 @@ - false - true - true - - [alias-of-log-type-in-lowercase] - anotherlogalias - - 86400 1440 - diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config index c4b25919d2..fa60e31a08 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.config @@ -118,21 +118,6 @@ - - - true - true - - - - - - - - diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs index ae27809987..c39f9df1b3 100644 --- a/src/Umbraco.Web/Scheduling/LogScrubber.cs +++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs @@ -49,16 +49,7 @@ namespace Umbraco.Web.Scheduling public static int GetLogScrubbingInterval(IUmbracoSettingsSection settings, ILogger logger) { - var interval = 4 * 60 * 60 * 1000; // 4 hours, in milliseconds - try - { - if (settings.Logging.CleaningMiliseconds > -1) - interval = settings.Logging.CleaningMiliseconds; - } - catch (Exception ex) - { - logger.Error(ex, "Unable to locate a log scrubbing interval. Defaulting to 4 hours."); - } + const int interval = 4 * 60 * 60 * 1000; // 4 hours, in milliseconds return interval; }