Refactor: replaced all indentations that are spaces with tabs in all *.cs files
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/82c3e389 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/82c3e389 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/82c3e389 Branch: refs/heads/develop Commit: 82c3e389fce552ab88f3d2b00ba9827e9258f2d9 Parents: 8a5b420 Author: Dominik Psenner <[email protected]> Authored: Thu Jul 27 18:49:22 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Thu Jul 27 18:49:22 2017 +0200 ---------------------------------------------------------------------- .../src/Appender/PatternLayoutAdoNetAppender.cs | 110 ++-- .../PatternLayoutAdoNetAppenderParameter.cs | 18 +- .../cs/src/Layout/LevelConversionPattern.cs | 30 +- .../cs/src/Layout/LevelPatternLayout.cs | 40 +- .../log4net.tests/ApplicationException.cs | 6 +- .../log4net.tests/CompatibilityExtensions.cs | 20 +- .../log4net.tests/ExpectedExceptionAttribute.cs | 96 +-- netstandard/log4net/CompatibilityExtensions.cs | 30 +- src/Appender/AppenderSkeleton.cs | 50 +- src/Appender/AspNetTraceAppender.cs | 64 +- src/Appender/BufferingAppenderSkeleton.cs | 22 +- src/Appender/ColoredConsoleAppender.cs | 12 +- src/Appender/DebugAppender.cs | 102 ++-- src/Appender/EventLogAppender.cs | 318 +++++----- src/Appender/FileAppender.cs | 30 +- src/Appender/IFlushable.cs | 70 +-- src/Appender/LocalSyslogAppender.cs | 14 +- src/Appender/ManagedColoredConsoleAppender.cs | 22 +- src/Appender/MemoryAppender.cs | 60 +- src/Appender/NetSendAppender.cs | 6 +- src/Appender/OutputDebugStringAppender.cs | 6 +- src/Appender/RemoteSyslogAppender.cs | 156 ++--- src/Appender/RemotingAppender.cs | 4 +- src/Appender/SmtpAppender.cs | 252 ++++---- src/Appender/SmtpPickupDirAppender.cs | 2 +- src/Appender/TelnetAppender.cs | 24 +- src/Appender/TextWriterAppender.cs | 72 +-- src/Appender/TraceAppender.cs | 80 +-- src/Config/BasicConfigurator.cs | 214 +++---- src/Config/SecurityContextProviderAttribute.cs | 24 +- src/Config/XmlConfigurator.cs | 604 +++++++++---------- src/Config/XmlConfiguratorAttribute.cs | 74 +-- src/Core/CompactRepositorySelector.cs | 24 +- src/Core/DefaultRepositorySelector.cs | 80 +-- src/Core/Level.cs | 10 +- src/Core/LocationInfo.cs | 18 +- src/Core/LoggerManager.cs | 20 +- src/Core/LoggingEvent.cs | 144 ++--- src/Core/MethodItem.cs | 10 +- src/Core/StackFrameItem.cs | 282 ++++----- src/Core/TimeEvaluator.cs | 230 +++---- src/DateFormatter/AbsoluteTimeDateFormatter.cs | 40 +- src/Layout/LayoutSkeleton.cs | 182 +++--- .../Pattern/AspNetRequestPatternConverter.cs | 8 +- src/Layout/Pattern/DatePatternConverter.cs | 20 +- src/Layout/Pattern/NamedPatternConverter.cs | 58 +- .../Pattern/StackTraceDetailPatternConverter.cs | 102 ++-- .../Pattern/StackTracePatternConverter.cs | 42 +- src/Layout/Pattern/UtcDatePatternConverter.cs | 20 +- src/Layout/PatternLayout.cs | 142 ++--- src/Layout/XmlLayoutSchemaLog4j.cs | 8 +- src/Log4netAssemblyInfo.cs | 88 +-- src/LogManager.cs | 70 +-- src/ObjectRenderer/RendererMap.cs | 2 +- src/Plugin/RemoteLoggingServerPlugin.cs | 28 +- src/Repository/ConfigurationChangedEventArgs.cs | 44 +- src/Repository/Hierarchy/Hierarchy.cs | 98 +-- src/Repository/Hierarchy/Logger.cs | 14 +- src/Repository/Hierarchy/RootLogger.cs | 20 +- .../Hierarchy/XmlHierarchyConfigurator.cs | 94 +-- src/Repository/IBasicRepositoryConfigurator.cs | 24 +- src/Repository/ILoggerRepository.cs | 12 +- src/Repository/LoggerRepositorySkeleton.cs | 154 ++--- src/Util/AppenderAttachedImpl.cs | 32 +- src/Util/ConverterInfo.cs | 126 ++-- src/Util/LogLog.cs | 488 +++++++-------- src/Util/LogicalThreadContextProperties.cs | 42 +- src/Util/LogicalThreadContextStack.cs | 14 +- src/Util/NativeError.cs | 12 +- src/Util/OnlyOnceErrorHandler.cs | 102 ++-- src/Util/OptionConverter.cs | 16 +- src/Util/PatternConverter.cs | 58 +- src/Util/PatternParser.cs | 30 +- src/Util/PatternString.cs | 28 +- .../AppSettingPatternConverter.cs | 150 ++--- .../DatePatternConverter.cs | 20 +- .../EnvironmentFolderPathPatternConverter.cs | 130 ++-- .../EnvironmentPatternConverter.cs | 40 +- .../IdentityPatternConverter.cs | 20 +- .../ProcessIdPatternConverter.cs | 24 +- .../RandomStringPatternConverter.cs | 20 +- .../UserNamePatternConverter.cs | 20 +- .../UtcDatePatternConverter.cs | 20 +- src/Util/PropertyEntry.cs | 106 ++-- src/Util/ReadOnlyPropertiesDictionary.cs | 10 +- src/Util/ReaderWriterLock.cs | 20 +- src/Util/SystemInfo.cs | 194 +++--- src/Util/SystemStringFormat.cs | 24 +- src/Util/ThreadContextStacks.cs | 24 +- src/Util/Transform.cs | 6 +- src/Util/TypeConverters/BooleanConverter.cs | 10 +- src/Util/TypeConverters/ConverterRegistry.cs | 16 +- src/Util/WindowsSecurityContext.cs | 6 +- tests/src/Appender/AdoNet/Log4NetCommand.cs | 234 +++---- tests/src/Appender/AdoNet/Log4NetConnection.cs | 168 +++--- tests/src/Appender/AdoNet/Log4NetParameter.cs | 152 ++--- .../AdoNet/Log4NetParameterCollection.cs | 62 +- tests/src/Appender/AdoNet/Log4NetTransaction.cs | 54 +- tests/src/Appender/AdoNetAppenderTest.cs | 588 +++++++++--------- tests/src/Appender/DebugAppenderTest.cs | 214 +++---- tests/src/Appender/EventLogAppenderTest.cs | 22 +- tests/src/Appender/EventRaisingAppender.cs | 86 +-- tests/src/Appender/MemoryAppenderTest.cs | 86 +-- tests/src/Appender/RecursiveLoggingTest.cs | 74 +-- tests/src/Appender/RemotingAppenderTest.cs | 32 +- tests/src/Appender/TraceAppenderTest.cs | 144 ++--- tests/src/Context/ThreadContextTest.cs | 24 +- tests/src/Core/FixingTest.cs | 36 +- .../AbsoluteTimeDateFormatterTest.cs | 134 ++-- tests/src/Filter/FilterTest.cs | 148 ++--- tests/src/Hierarchy/Hierarchy.cs | 256 ++++---- .../Hierarchy/XmlHierarchyConfiguratorTest.cs | 50 +- tests/src/Layout/DynamicPatternLayoutTest.cs | 22 +- tests/src/Layout/PatternLayoutTest.cs | 348 +++++------ tests/src/Layout/XmlLayoutTest.cs | 130 ++-- .../LoggerRepository/ConfigurationMessages.cs | 114 ++-- .../src/Util/EnvironmentPatternConverterTest.cs | 126 ++-- tests/src/Util/LogLogTest.cs | 160 ++--- tests/src/Util/PatternConverterTest.cs | 314 +++++----- tests/src/Util/PatternStringTest.cs | 130 ++-- tests/src/Util/SystemInfoTest.cs | 74 +-- tests/src/Util/TransformTest.cs | 32 +- tests/src/Utils.cs | 36 +- 123 files changed, 5289 insertions(+), 5289 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppender.cs ---------------------------------------------------------------------- diff --git a/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppender.cs b/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppender.cs index 83cf9ff..347ab15 100644 --- a/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppender.cs +++ b/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppender.cs @@ -24,63 +24,63 @@ using log4net.Util; namespace SampleAppendersApp.Appender { - /// <summary> - /// - /// </summary> - /// <example> - /// <code> - /// <![CDATA[ - /// <appender name="PatternLayoutAdoNetAppender" type="ConsoleApplication1.PatternLayoutAdoNetAppender, ConsoleApplication1"> - /// <connectionType value="log4net.Tests.Appender.AdoNet.Log4NetConnection, log4net.Tests" /> - /// <connectionString value="..." /> - /// <commandText value="INSERT INTO Log4Net (CustomValue1, CustomValue2) VALUES (@CustomValue1, @CustsomValue2)" /> - /// <converter> - /// <name value="echo" /> - /// <type value="ConsoleApplication1.EchoConverter, ConsoleApplication1" /> - /// </converter> - /// <converter> - /// <name value="reverse" /> - /// <type value="ConsoleApplication1.ReverseConverter, ConsoleApplication1" /> - /// </converter> - /// <patternLayoutParameter> - /// <parameterName value="@CustomValue1"/> - /// <dbType value="String" /> - /// <conversionPattern value="%echo{Hello World}" /> - /// </patternLayoutParameter> - /// <patternLayoutParameter> - /// <parameterName value="@CustomValue2"/> - /// <dbType value="String" /> - /// <conversionPattern value="%reverse{Goodbye}" /> - /// </patternLayoutParameter> - /// </appender> - /// ]]> - /// </code> - /// </example> - public class PatternLayoutAdoNetAppender : AdoNetAppender - { - private readonly ArrayList m_converters = new ArrayList(); + /// <summary> + /// + /// </summary> + /// <example> + /// <code> + /// <![CDATA[ + /// <appender name="PatternLayoutAdoNetAppender" type="ConsoleApplication1.PatternLayoutAdoNetAppender, ConsoleApplication1"> + /// <connectionType value="log4net.Tests.Appender.AdoNet.Log4NetConnection, log4net.Tests" /> + /// <connectionString value="..." /> + /// <commandText value="INSERT INTO Log4Net (CustomValue1, CustomValue2) VALUES (@CustomValue1, @CustsomValue2)" /> + /// <converter> + /// <name value="echo" /> + /// <type value="ConsoleApplication1.EchoConverter, ConsoleApplication1" /> + /// </converter> + /// <converter> + /// <name value="reverse" /> + /// <type value="ConsoleApplication1.ReverseConverter, ConsoleApplication1" /> + /// </converter> + /// <patternLayoutParameter> + /// <parameterName value="@CustomValue1"/> + /// <dbType value="String" /> + /// <conversionPattern value="%echo{Hello World}" /> + /// </patternLayoutParameter> + /// <patternLayoutParameter> + /// <parameterName value="@CustomValue2"/> + /// <dbType value="String" /> + /// <conversionPattern value="%reverse{Goodbye}" /> + /// </patternLayoutParameter> + /// </appender> + /// ]]> + /// </code> + /// </example> + public class PatternLayoutAdoNetAppender : AdoNetAppender + { + private readonly ArrayList m_converters = new ArrayList(); - public void AddConverter(ConverterInfo converterInfo) - { - m_converters.Add(converterInfo); - } + public void AddConverter(ConverterInfo converterInfo) + { + m_converters.Add(converterInfo); + } - public void AddPatternLayoutParameter(PatternLayoutAdoNetAppenderParameter parameter) - { - PatternLayout patternLayout = new PatternLayout(parameter.ConversionPattern); - addConveters(patternLayout); - patternLayout.ActivateOptions(); + public void AddPatternLayoutParameter(PatternLayoutAdoNetAppenderParameter parameter) + { + PatternLayout patternLayout = new PatternLayout(parameter.ConversionPattern); + addConveters(patternLayout); + patternLayout.ActivateOptions(); - parameter.Layout = new Layout2RawLayoutAdapter(patternLayout); - m_parameters.Add(parameter); - } + parameter.Layout = new Layout2RawLayoutAdapter(patternLayout); + m_parameters.Add(parameter); + } - private void addConveters(PatternLayout patternLayout) - { - foreach (ConverterInfo conveterInfo in m_converters) - { - patternLayout.AddConverter(conveterInfo); - } - } - } + private void addConveters(PatternLayout patternLayout) + { + foreach (ConverterInfo conveterInfo in m_converters) + { + patternLayout.AddConverter(conveterInfo); + } + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppenderParameter.cs ---------------------------------------------------------------------- diff --git a/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppenderParameter.cs b/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppenderParameter.cs index f53d47c..05f618b 100644 --- a/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppenderParameter.cs +++ b/examples/net/2.0/Appenders/SampleAppendersApp/cs/src/Appender/PatternLayoutAdoNetAppenderParameter.cs @@ -21,14 +21,14 @@ using log4net.Appender; namespace SampleAppendersApp.Appender { - public class PatternLayoutAdoNetAppenderParameter : AdoNetAppenderParameter - { - private string conversionPattern; + public class PatternLayoutAdoNetAppenderParameter : AdoNetAppenderParameter + { + private string conversionPattern; - public string ConversionPattern - { - get { return conversionPattern; } - set { conversionPattern = value; } - } - } + public string ConversionPattern + { + get { return conversionPattern; } + set { conversionPattern = value; } + } + } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelConversionPattern.cs ---------------------------------------------------------------------- diff --git a/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelConversionPattern.cs b/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelConversionPattern.cs index c5e316a..2717f0c 100644 --- a/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelConversionPattern.cs +++ b/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelConversionPattern.cs @@ -21,21 +21,21 @@ using log4net.Core; namespace SampleLayoutsApp.Layout { - public class LevelConversionPattern - { - private Level level; - private string conversionPattern; + public class LevelConversionPattern + { + private Level level; + private string conversionPattern; - public Level Level - { - get { return level; } - set { level = value; } - } + public Level Level + { + get { return level; } + set { level = value; } + } - public string ConversionPattern - { - get { return conversionPattern; } - set { conversionPattern = value; } - } - } + public string ConversionPattern + { + get { return conversionPattern; } + set { conversionPattern = value; } + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelPatternLayout.cs ---------------------------------------------------------------------- diff --git a/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelPatternLayout.cs b/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelPatternLayout.cs index b37b377..de2a34d 100644 --- a/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelPatternLayout.cs +++ b/examples/net/2.0/Layouts/SampleLayoutsApp/cs/src/Layout/LevelPatternLayout.cs @@ -24,27 +24,27 @@ using log4net.Layout; namespace SampleLayoutsApp.Layout { - public class LevelPatternLayout : PatternLayout - { - private readonly Hashtable m_levelToPatternLayout = new Hashtable(); + public class LevelPatternLayout : PatternLayout + { + private readonly Hashtable m_levelToPatternLayout = new Hashtable(); - public override void Format(TextWriter writer, LoggingEvent loggingEvent) - { - PatternLayout patternLayout = m_levelToPatternLayout[loggingEvent.Level] as PatternLayout; + public override void Format(TextWriter writer, LoggingEvent loggingEvent) + { + PatternLayout patternLayout = m_levelToPatternLayout[loggingEvent.Level] as PatternLayout; - if (patternLayout == null) - { - base.Format(writer, loggingEvent); - } - else - { - patternLayout.Format(writer, loggingEvent); - } - } + if (patternLayout == null) + { + base.Format(writer, loggingEvent); + } + else + { + patternLayout.Format(writer, loggingEvent); + } + } - public void AddLevelConversionPattern(LevelConversionPattern levelLayout) - { - m_levelToPatternLayout[levelLayout.Level] = new PatternLayout(levelLayout.ConversionPattern); - } - } + public void AddLevelConversionPattern(LevelConversionPattern levelLayout) + { + m_levelToPatternLayout[levelLayout.Level] = new PatternLayout(levelLayout.ConversionPattern); + } + } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/netstandard/log4net.tests/ApplicationException.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net.tests/ApplicationException.cs b/netstandard/log4net.tests/ApplicationException.cs index 3d751a7..30bfe37 100644 --- a/netstandard/log4net.tests/ApplicationException.cs +++ b/netstandard/log4net.tests/ApplicationException.cs @@ -21,7 +21,7 @@ using System; namespace log4net.Tests { - public class ApplicationException : Exception - { - } + public class ApplicationException : Exception + { + } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/netstandard/log4net.tests/CompatibilityExtensions.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net.tests/CompatibilityExtensions.cs b/netstandard/log4net.tests/CompatibilityExtensions.cs index 466f041..a634ed0 100644 --- a/netstandard/log4net.tests/CompatibilityExtensions.cs +++ b/netstandard/log4net.tests/CompatibilityExtensions.cs @@ -24,15 +24,15 @@ using System.Threading; namespace log4net { - internal static class CompatibilityExtensions - { - public static void Close(this Mutex mutex) => mutex.Dispose(); - public static void Close(this Stream stream) => stream.Dispose(); - public static void Close(this StreamReader streamReader) => streamReader.Dispose(); + internal static class CompatibilityExtensions + { + public static void Close(this Mutex mutex) => mutex.Dispose(); + public static void Close(this Stream stream) => stream.Dispose(); + public static void Close(this StreamReader streamReader) => streamReader.Dispose(); - public static ConstructorInfo GetConstructor(this Type type, BindingFlags bindingAttr, object binder, Type[] types, object[] modifiers) - { - return type.GetConstructor(types); - } - } + public static ConstructorInfo GetConstructor(this Type type, BindingFlags bindingAttr, object binder, Type[] types, object[] modifiers) + { + return type.GetConstructor(types); + } + } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/netstandard/log4net.tests/ExpectedExceptionAttribute.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net.tests/ExpectedExceptionAttribute.cs b/netstandard/log4net.tests/ExpectedExceptionAttribute.cs index d88e702..771922a 100644 --- a/netstandard/log4net.tests/ExpectedExceptionAttribute.cs +++ b/netstandard/log4net.tests/ExpectedExceptionAttribute.cs @@ -26,60 +26,60 @@ using NUnit.Framework.Internal.Commands; namespace NUnit.Framework { - /// <summary> - /// A simple ExpectedExceptionAttribute - /// </summary> - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] - public class ExpectedExceptionAttribute : NUnitAttribute, IWrapTestMethod - { - private readonly Type _expectedExceptionType; + /// <summary> + /// A simple ExpectedExceptionAttribute + /// </summary> + [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] + public class ExpectedExceptionAttribute : NUnitAttribute, IWrapTestMethod + { + private readonly Type _expectedExceptionType; - public ExpectedExceptionAttribute(Type type) - { - _expectedExceptionType = type; - } + public ExpectedExceptionAttribute(Type type) + { + _expectedExceptionType = type; + } - public TestCommand Wrap(TestCommand command) - { - return new ExpectedExceptionCommand(command, _expectedExceptionType); - } + public TestCommand Wrap(TestCommand command) + { + return new ExpectedExceptionCommand(command, _expectedExceptionType); + } - private class ExpectedExceptionCommand : DelegatingTestCommand - { - private readonly Type _expectedType; + private class ExpectedExceptionCommand : DelegatingTestCommand + { + private readonly Type _expectedType; - public ExpectedExceptionCommand(TestCommand innerCommand, Type expectedType) - : base(innerCommand) - { - _expectedType = expectedType; - } + public ExpectedExceptionCommand(TestCommand innerCommand, Type expectedType) + : base(innerCommand) + { + _expectedType = expectedType; + } - public override TestResult Execute(TestExecutionContext context) - { - Type caughtType = null; + public override TestResult Execute(TestExecutionContext context) + { + Type caughtType = null; - try - { - innerCommand.Execute(context); - } - catch (Exception ex) - { - if (ex is NUnitException) - ex = ex.InnerException; - caughtType = ex.GetType(); - } + try + { + innerCommand.Execute(context); + } + catch (Exception ex) + { + if (ex is NUnitException) + ex = ex.InnerException; + caughtType = ex.GetType(); + } - if (caughtType == _expectedType) - context.CurrentResult.SetResult(ResultState.Success); - else if (caughtType != null) - context.CurrentResult.SetResult(ResultState.Failure, - string.Format("Expected {0} but got {1}", _expectedType.Name, caughtType.Name)); - else - context.CurrentResult.SetResult(ResultState.Failure, - string.Format("Expected {0} but no exception was thrown", _expectedType.Name)); + if (caughtType == _expectedType) + context.CurrentResult.SetResult(ResultState.Success); + else if (caughtType != null) + context.CurrentResult.SetResult(ResultState.Failure, + string.Format("Expected {0} but got {1}", _expectedType.Name, caughtType.Name)); + else + context.CurrentResult.SetResult(ResultState.Failure, + string.Format("Expected {0} but no exception was thrown", _expectedType.Name)); - return context.CurrentResult; - } - } - } + return context.CurrentResult; + } + } + } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/netstandard/log4net/CompatibilityExtensions.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net/CompatibilityExtensions.cs b/netstandard/log4net/CompatibilityExtensions.cs index e36bae8..48957f2 100644 --- a/netstandard/log4net/CompatibilityExtensions.cs +++ b/netstandard/log4net/CompatibilityExtensions.cs @@ -31,23 +31,23 @@ using System.Xml; namespace log4net { - internal static class CompatibilityExtensions - { - public static void Close(this Mutex mutex) => mutex.Dispose(); - public static void Close(this Socket socket) => socket.Dispose(); - public static void Close(this Stream stream) => stream.Dispose(); - public static void Close(this StreamWriter streamWriter) => streamWriter.Dispose(); - public static void Close(this UdpClient client) => client.Dispose(); - public static void Close(this WebResponse response) => response.Dispose(); - public static void Close(this XmlWriter xmlWriter) => xmlWriter.Dispose(); + internal static class CompatibilityExtensions + { + public static void Close(this Mutex mutex) => mutex.Dispose(); + public static void Close(this Socket socket) => socket.Dispose(); + public static void Close(this Stream stream) => stream.Dispose(); + public static void Close(this StreamWriter streamWriter) => streamWriter.Dispose(); + public static void Close(this UdpClient client) => client.Dispose(); + public static void Close(this WebResponse response) => response.Dispose(); + public static void Close(this XmlWriter xmlWriter) => xmlWriter.Dispose(); - public static Attribute[] GetCustomAttributes(this Type type, Type other, bool inherit) => type.GetTypeInfo().GetCustomAttributes(other, inherit).ToArray(); - public static bool IsAssignableFrom(this Type type, Type other) => type.GetTypeInfo().IsAssignableFrom(other.GetTypeInfo()); - public static bool IsSubclassOf(this Type type, Type t) => type.GetTypeInfo().IsSubclassOf(t); + public static Attribute[] GetCustomAttributes(this Type type, Type other, bool inherit) => type.GetTypeInfo().GetCustomAttributes(other, inherit).ToArray(); + public static bool IsAssignableFrom(this Type type, Type other) => type.GetTypeInfo().IsAssignableFrom(other.GetTypeInfo()); + public static bool IsSubclassOf(this Type type, Type t) => type.GetTypeInfo().IsSubclassOf(t); - public static string ToLower(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToLower(s); - public static string ToUpper(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToUpper(s); - } + public static string ToLower(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToLower(s); + public static string ToUpper(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToUpper(s); + } } #endif http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/AppenderSkeleton.cs ---------------------------------------------------------------------- diff --git a/src/Appender/AppenderSkeleton.cs b/src/Appender/AppenderSkeleton.cs index 00717e6..37a7416 100644 --- a/src/Appender/AppenderSkeleton.cs +++ b/src/Appender/AppenderSkeleton.cs @@ -697,14 +697,14 @@ namespace log4net.Appender m_renderWriter = new ReusableStringWriter(System.Globalization.CultureInfo.InvariantCulture); } - lock (m_renderWriter) - { - // Reset the writer so we can reuse it - m_renderWriter.Reset(c_renderBufferMaxCapacity, c_renderBufferSize); - - RenderLoggingEvent(m_renderWriter, loggingEvent); - return m_renderWriter.ToString(); - } + lock (m_renderWriter) + { + // Reset the writer so we can reuse it + m_renderWriter.Reset(c_renderBufferMaxCapacity, c_renderBufferSize); + + RenderLoggingEvent(m_renderWriter, loggingEvent); + return m_renderWriter.ToString(); + } } /// <summary> @@ -783,16 +783,16 @@ namespace log4net.Appender #endregion /// <summary> - /// Flushes any buffered log data. - /// </summary> + /// Flushes any buffered log data. + /// </summary> /// <remarks> /// This implementation doesn't flush anything and always returns true /// </remarks> - /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> - public virtual bool Flush(int millisecondsTimeout) - { - return true; - } + /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> + public virtual bool Flush(int millisecondsTimeout) + { + return true; + } #region Private Instance Fields @@ -893,17 +893,17 @@ namespace log4net.Appender #endregion - #region Private Static Fields + #region Private Static Fields - /// <summary> - /// The fully qualified type of the AppenderSkeleton class. - /// </summary> - /// <remarks> - /// Used by the internal logger to record the Type of the - /// log message. - /// </remarks> - private readonly static Type declaringType = typeof(AppenderSkeleton); + /// <summary> + /// The fully qualified type of the AppenderSkeleton class. + /// </summary> + /// <remarks> + /// Used by the internal logger to record the Type of the + /// log message. + /// </remarks> + private readonly static Type declaringType = typeof(AppenderSkeleton); - #endregion Private Static Fields + #endregion Private Static Fields } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/AspNetTraceAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/AspNetTraceAppender.cs b/src/Appender/AspNetTraceAppender.cs index 2a9899d..b2e8798 100644 --- a/src/Appender/AspNetTraceAppender.cs +++ b/src/Appender/AspNetTraceAppender.cs @@ -47,7 +47,7 @@ namespace log4net.Appender /// <para> /// The logging event is passed to the <see cref="M:TraceContext.Write(string)"/> or /// <see cref="M:TraceContext.Warn(string)"/> method depending on the level of the logging event. - /// The event's logger name is the default value for the category parameter of the Write/Warn method. + /// The event's logger name is the default value for the category parameter of the Write/Warn method. /// </para> /// </remarks> /// <author>Nicko Cadell</author> @@ -94,11 +94,11 @@ namespace log4net.Appender { if (loggingEvent.Level >= Level.Warn) { - HttpContext.Current.Trace.Warn(m_category.Format(loggingEvent), RenderLoggingEvent(loggingEvent)); + HttpContext.Current.Trace.Warn(m_category.Format(loggingEvent), RenderLoggingEvent(loggingEvent)); } else { - HttpContext.Current.Trace.Write(m_category.Format(loggingEvent), RenderLoggingEvent(loggingEvent)); + HttpContext.Current.Trace.Write(m_category.Format(loggingEvent), RenderLoggingEvent(loggingEvent)); } } } @@ -120,35 +120,35 @@ namespace log4net.Appender #endregion // Override implementation of AppenderSkeleton - #region Public Instance Properties - - /// <summary> - /// The category parameter sent to the Trace method. - /// </summary> - /// <remarks> - /// <para> - /// Defaults to %logger which will use the logger name of the current - /// <see cref="LoggingEvent"/> as the category parameter. - /// </para> - /// <para> - /// </para> - /// </remarks> - public PatternLayout Category - { - get { return m_category; } - set { m_category = value; } - } - - #endregion - - #region Private Instance Fields - - /// <summary> - /// Defaults to %logger - /// </summary> - private PatternLayout m_category = new PatternLayout("%logger"); - - #endregion + #region Public Instance Properties + + /// <summary> + /// The category parameter sent to the Trace method. + /// </summary> + /// <remarks> + /// <para> + /// Defaults to %logger which will use the logger name of the current + /// <see cref="LoggingEvent"/> as the category parameter. + /// </para> + /// <para> + /// </para> + /// </remarks> + public PatternLayout Category + { + get { return m_category; } + set { m_category = value; } + } + + #endregion + + #region Private Instance Fields + + /// <summary> + /// Defaults to %logger + /// </summary> + private PatternLayout m_category = new PatternLayout("%logger"); + + #endregion } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/BufferingAppenderSkeleton.cs ---------------------------------------------------------------------- diff --git a/src/Appender/BufferingAppenderSkeleton.cs b/src/Appender/BufferingAppenderSkeleton.cs index b826b66..bdb4cf4 100644 --- a/src/Appender/BufferingAppenderSkeleton.cs +++ b/src/Appender/BufferingAppenderSkeleton.cs @@ -68,7 +68,7 @@ namespace log4net.Appender /// </remarks> /// <author>Nicko Cadell</author> /// <author>Gert Driesen</author> - public abstract class BufferingAppenderSkeleton : AppenderSkeleton + public abstract class BufferingAppenderSkeleton : AppenderSkeleton { #region Protected Instance Constructors @@ -261,16 +261,16 @@ namespace log4net.Appender #region Public Methods - /// <summary> - /// Flushes any buffered log data. - /// </summary> - /// <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param> - /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> - public override bool Flush(int millisecondsTimeout) - { - Flush(); - return true; - } + /// <summary> + /// Flushes any buffered log data. + /// </summary> + /// <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param> + /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> + public override bool Flush(int millisecondsTimeout) + { + Flush(); + return true; + } /// <summary> /// Flush the currently buffered events http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/ColoredConsoleAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/ColoredConsoleAppender.cs b/src/Appender/ColoredConsoleAppender.cs index 9d2b9a4..a87ffd9 100644 --- a/src/Appender/ColoredConsoleAppender.cs +++ b/src/Appender/ColoredConsoleAppender.cs @@ -266,10 +266,10 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #endif - [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] - override protected void Append(log4net.Core.LoggingEvent loggingEvent) + [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] + override protected void Append(log4net.Core.LoggingEvent loggingEvent) { if (m_consoleOutputWriter != null) { @@ -435,10 +435,10 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #endif - [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode=true)] - public override void ActivateOptions() + [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode=true)] + public override void ActivateOptions() { base.ActivateOptions(); m_levelMapping.ActivateOptions(); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/DebugAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/DebugAppender.cs b/src/Appender/DebugAppender.cs index 603b725..c2ac557 100644 --- a/src/Appender/DebugAppender.cs +++ b/src/Appender/DebugAppender.cs @@ -100,41 +100,41 @@ namespace log4net.Appender set { m_immediateFlush = value; } } - /// <summary> - /// Formats the category parameter sent to the Debug method. - /// </summary> - /// <remarks> - /// <para> - /// Defaults to a <see cref="Layout.PatternLayout"/> with %logger as the pattern which will use the logger name of the current - /// <see cref="LoggingEvent"/> as the category parameter. - /// </para> - /// <para> - /// </para> - /// </remarks> - public PatternLayout Category - { - get { return m_category; } - set { m_category = value; } - } + /// <summary> + /// Formats the category parameter sent to the Debug method. + /// </summary> + /// <remarks> + /// <para> + /// Defaults to a <see cref="Layout.PatternLayout"/> with %logger as the pattern which will use the logger name of the current + /// <see cref="LoggingEvent"/> as the category parameter. + /// </para> + /// <para> + /// </para> + /// </remarks> + public PatternLayout Category + { + get { return m_category; } + set { m_category = value; } + } #endregion Public Instance Properties #if !NETSTANDARD1_3 - /// <summary> - /// Flushes any buffered log data. - /// </summary> - /// <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param> - /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> - public override bool Flush(int millisecondsTimeout) - { - // Nothing to do if ImmediateFlush is true - if (m_immediateFlush) return true; - - // System.Diagnostics.Debug is thread-safe, so no need for lock(this). - System.Diagnostics.Debug.Flush(); - - return true; - } + /// <summary> + /// Flushes any buffered log data. + /// </summary> + /// <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param> + /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> + public override bool Flush(int millisecondsTimeout) + { + // Nothing to do if ImmediateFlush is true + if (m_immediateFlush) return true; + + // System.Diagnostics.Debug is thread-safe, so no need for lock(this). + System.Diagnostics.Debug.Flush(); + + return true; + } #endif #region Override implementation of AppenderSkeleton @@ -155,22 +155,22 @@ namespace log4net.Appender // // Write the string to the Debug system // - if(m_category == null) - { - System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent)); - } - else - { - string category = m_category.Format(loggingEvent); - if (string.IsNullOrEmpty(category)) - { - System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent)); - } - else - { - System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent), category); - } - } + if(m_category == null) + { + System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent)); + } + else + { + string category = m_category.Format(loggingEvent); + if (string.IsNullOrEmpty(category)) + { + System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent)); + } + else + { + System.Diagnostics.Debug.Write(RenderLoggingEvent(loggingEvent), category); + } + } #if !NETSTANDARD1_3 // // Flush the Debug system if needed @@ -217,10 +217,10 @@ namespace log4net.Appender /// </remarks> private bool m_immediateFlush = true; - /// <summary> - /// Defaults to a <see cref="Layout.PatternLayout"/> with %logger as the pattern. - /// </summary> - private PatternLayout m_category = new PatternLayout("%logger"); + /// <summary> + /// Defaults to a <see cref="Layout.PatternLayout"/> with %logger as the pattern. + /// </summary> + private PatternLayout m_category = new PatternLayout("%logger"); #endregion Private Instance Fields } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/EventLogAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/EventLogAppender.cs b/src/Appender/EventLogAppender.cs index 8cf183a..9752c6f 100644 --- a/src/Appender/EventLogAppender.cs +++ b/src/Appender/EventLogAppender.cs @@ -38,17 +38,17 @@ namespace log4net.Appender /// Writes events to the system event log. /// </summary> /// <remarks> - /// <para> - /// The appender will fail if you try to write using an event source that doesn't exist unless it is running with local administrator privileges. - /// See also http://logging.apache.org/log4net/release/faq.html#trouble-EventLog - /// </para> + /// <para> + /// The appender will fail if you try to write using an event source that doesn't exist unless it is running with local administrator privileges. + /// See also http://logging.apache.org/log4net/release/faq.html#trouble-EventLog + /// </para> /// <para> /// The <c>EventID</c> of the event log entry can be /// set using the <c>EventID</c> property (<see cref="LoggingEvent.Properties"/>) /// on the <see cref="LoggingEvent"/>. /// </para> - /// <para> - /// The <c>Category</c> of the event log entry can be + /// <para> + /// The <c>Category</c> of the event log entry can be /// set using the <c>Category</c> property (<see cref="LoggingEvent.Properties"/>) /// on the <see cref="LoggingEvent"/>. /// </para> @@ -220,40 +220,40 @@ namespace log4net.Appender set { m_securityContext = value; } } - /// <summary> - /// Gets or sets the <c>EventId</c> to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. - /// </summary> - /// <remarks> - /// <para> - /// The <c>EventID</c> of the event log entry will normally be - /// set using the <c>EventID</c> property (<see cref="LoggingEvent.Properties"/>) - /// on the <see cref="LoggingEvent"/>. - /// This property provides the fallback value which defaults to 0. - /// </para> - /// </remarks> - public int EventId { - get { return m_eventId; } - set { m_eventId = value; } - } - - - /// <summary> - /// Gets or sets the <c>Category</c> to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. - /// </summary> - /// <remarks> - /// <para> - /// The <c>Category</c> of the event log entry will normally be - /// set using the <c>Category</c> property (<see cref="LoggingEvent.Properties"/>) - /// on the <see cref="LoggingEvent"/>. - /// This property provides the fallback value which defaults to 0. - /// </para> - /// </remarks> - public short Category - { - get { return m_category; } - set { m_category = value; } - } - #endregion // Public Instance Properties + /// <summary> + /// Gets or sets the <c>EventId</c> to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. + /// </summary> + /// <remarks> + /// <para> + /// The <c>EventID</c> of the event log entry will normally be + /// set using the <c>EventID</c> property (<see cref="LoggingEvent.Properties"/>) + /// on the <see cref="LoggingEvent"/>. + /// This property provides the fallback value which defaults to 0. + /// </para> + /// </remarks> + public int EventId { + get { return m_eventId; } + set { m_eventId = value; } + } + + + /// <summary> + /// Gets or sets the <c>Category</c> to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. + /// </summary> + /// <remarks> + /// <para> + /// The <c>Category</c> of the event log entry will normally be + /// set using the <c>Category</c> property (<see cref="LoggingEvent.Properties"/>) + /// on the <see cref="LoggingEvent"/>. + /// This property provides the fallback value which defaults to 0. + /// </para> + /// </remarks> + public short Category + { + get { return m_category; } + set { m_category = value; } + } + #endregion // Public Instance Properties #region Implementation of IOptionHandler @@ -275,71 +275,71 @@ namespace log4net.Appender /// </remarks> override public void ActivateOptions() { - try - { - base.ActivateOptions(); - - if (m_securityContext == null) - { - m_securityContext = SecurityContextProvider.DefaultProvider.CreateSecurityContext(this); - } - - bool sourceAlreadyExists = false; - string currentLogName = null; - - using (SecurityContext.Impersonate(this)) - { - sourceAlreadyExists = EventLog.SourceExists(m_applicationName); - if (sourceAlreadyExists) { - currentLogName = EventLog.LogNameFromSourceName(m_applicationName, m_machineName); - } - } - - if (sourceAlreadyExists && currentLogName != m_logName) - { - LogLog.Debug(declaringType, "Changing event source [" + m_applicationName + "] from log [" + currentLogName + "] to log [" + m_logName + "]"); - } - else if (!sourceAlreadyExists) - { - LogLog.Debug(declaringType, "Creating event source Source [" + m_applicationName + "] in log " + m_logName + "]"); - } - - string registeredLogName = null; - - using (SecurityContext.Impersonate(this)) - { - if (sourceAlreadyExists && currentLogName != m_logName) - { - // - // Re-register this to the current application if the user has changed - // the application / logfile association - // - EventLog.DeleteEventSource(m_applicationName, m_machineName); - CreateEventSource(m_applicationName, m_logName, m_machineName); - - registeredLogName = EventLog.LogNameFromSourceName(m_applicationName, m_machineName); - } - else if (!sourceAlreadyExists) - { - CreateEventSource(m_applicationName, m_logName, m_machineName); - - registeredLogName = EventLog.LogNameFromSourceName(m_applicationName, m_machineName); - } - } - - m_levelMapping.ActivateOptions(); - - LogLog.Debug(declaringType, "Source [" + m_applicationName + "] is registered to log [" + registeredLogName + "]"); - } - catch (System.Security.SecurityException ex) - { - ErrorHandler.Error("Caught a SecurityException trying to access the EventLog. Most likely the event source " - + m_applicationName - + " doesn't exist and must be created by a local administrator. Will disable EventLogAppender." - + " See http://logging.apache.org/log4net/release/faq.html#trouble-EventLog";, - ex); - Threshold = Level.Off; - } + try + { + base.ActivateOptions(); + + if (m_securityContext == null) + { + m_securityContext = SecurityContextProvider.DefaultProvider.CreateSecurityContext(this); + } + + bool sourceAlreadyExists = false; + string currentLogName = null; + + using (SecurityContext.Impersonate(this)) + { + sourceAlreadyExists = EventLog.SourceExists(m_applicationName); + if (sourceAlreadyExists) { + currentLogName = EventLog.LogNameFromSourceName(m_applicationName, m_machineName); + } + } + + if (sourceAlreadyExists && currentLogName != m_logName) + { + LogLog.Debug(declaringType, "Changing event source [" + m_applicationName + "] from log [" + currentLogName + "] to log [" + m_logName + "]"); + } + else if (!sourceAlreadyExists) + { + LogLog.Debug(declaringType, "Creating event source Source [" + m_applicationName + "] in log " + m_logName + "]"); + } + + string registeredLogName = null; + + using (SecurityContext.Impersonate(this)) + { + if (sourceAlreadyExists && currentLogName != m_logName) + { + // + // Re-register this to the current application if the user has changed + // the application / logfile association + // + EventLog.DeleteEventSource(m_applicationName, m_machineName); + CreateEventSource(m_applicationName, m_logName, m_machineName); + + registeredLogName = EventLog.LogNameFromSourceName(m_applicationName, m_machineName); + } + else if (!sourceAlreadyExists) + { + CreateEventSource(m_applicationName, m_logName, m_machineName); + + registeredLogName = EventLog.LogNameFromSourceName(m_applicationName, m_machineName); + } + } + + m_levelMapping.ActivateOptions(); + + LogLog.Debug(declaringType, "Source [" + m_applicationName + "] is registered to log [" + registeredLogName + "]"); + } + catch (System.Security.SecurityException ex) + { + ErrorHandler.Error("Caught a SecurityException trying to access the EventLog. Most likely the event source " + + m_applicationName + + " doesn't exist and must be created by a local administrator. Will disable EventLogAppender." + + " See http://logging.apache.org/log4net/release/faq.html#trouble-EventLog";, + ex); + Threshold = Level.Off; + } } #endregion // Implementation of IOptionHandler @@ -397,10 +397,10 @@ namespace log4net.Appender else { string eventIDPropertyString = eventIDPropertyObj as string; - if (eventIDPropertyString == null) - { - eventIDPropertyString = eventIDPropertyObj.ToString(); - } + if (eventIDPropertyString == null) + { + eventIDPropertyString = eventIDPropertyObj.ToString(); + } if (eventIDPropertyString != null && eventIDPropertyString.Length > 0) { // Read the string property into a number @@ -417,37 +417,37 @@ namespace log4net.Appender } } - short category = m_category; - // Look for the Category property - object categoryPropertyObj = loggingEvent.LookupProperty("Category"); - if (categoryPropertyObj != null) - { - if (categoryPropertyObj is short) - { - category = (short) categoryPropertyObj; - } - else - { - string categoryPropertyString = categoryPropertyObj as string; - if (categoryPropertyString == null) - { - categoryPropertyString = categoryPropertyObj.ToString(); - } - if (categoryPropertyString != null && categoryPropertyString.Length > 0) - { - // Read the string property into a number - short shortVal; - if (SystemInfo.TryParse(categoryPropertyString, out shortVal)) - { - category = shortVal; - } - else - { - ErrorHandler.Error("Unable to parse event category property [" + categoryPropertyString + "]."); - } - } - } - } + short category = m_category; + // Look for the Category property + object categoryPropertyObj = loggingEvent.LookupProperty("Category"); + if (categoryPropertyObj != null) + { + if (categoryPropertyObj is short) + { + category = (short) categoryPropertyObj; + } + else + { + string categoryPropertyString = categoryPropertyObj as string; + if (categoryPropertyString == null) + { + categoryPropertyString = categoryPropertyObj.ToString(); + } + if (categoryPropertyString != null && categoryPropertyString.Length > 0) + { + // Read the string property into a number + short shortVal; + if (SystemInfo.TryParse(categoryPropertyString, out shortVal)) + { + category = shortVal; + } + else + { + ErrorHandler.Error("Unable to parse event category property [" + categoryPropertyString + "]."); + } + } + } + } // Write to the event log try @@ -558,17 +558,17 @@ namespace log4net.Appender /// </summary> private SecurityContext m_securityContext; - /// <summary> - /// The event ID to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. - /// </summary> - private int m_eventId = 0; + /// <summary> + /// The event ID to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. + /// </summary> + private int m_eventId = 0; - /// <summary> - /// The event category to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. - /// </summary> - private short m_category = 0; + /// <summary> + /// The event category to use unless one is explicitly specified via the <c>LoggingEvent</c>'s properties. + /// </summary> + private short m_category = 0; - #endregion // Private Instance Fields + #endregion // Private Instance Fields #region Level2EventLogEntryType LevelMapping Entry @@ -603,16 +603,16 @@ namespace log4net.Appender #endregion // LevelColors LevelMapping Entry - #region Private Static Fields + #region Private Static Fields - /// <summary> - /// The fully qualified type of the EventLogAppender class. - /// </summary> - /// <remarks> - /// Used by the internal logger to record the Type of the - /// log message. - /// </remarks> - private readonly static Type declaringType = typeof(EventLogAppender); + /// <summary> + /// The fully qualified type of the EventLogAppender class. + /// </summary> + /// <remarks> + /// Used by the internal logger to record the Type of the + /// log message. + /// </remarks> + private readonly static Type declaringType = typeof(EventLogAppender); /// <summary> /// The maximum size supported by default. @@ -682,7 +682,7 @@ namespace log4net.Appender return MAX_EVENTLOG_MESSAGE_SIZE_DEFAULT; } - #endregion Private Static Fields + #endregion Private Static Fields } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/FileAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index 5d0a8e3..f6bc151 100644 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -115,12 +115,12 @@ namespace log4net.Appender /// The default behavior, implemented by <see cref="FileAppender.ExclusiveLock"/> /// is to obtain an exclusive write lock on the file until this appender is closed. /// The alternative model only holds a - /// write lock while the appender is writing a logging event (<see cref="FileAppender.MinimalLock"/>). + /// write lock while the appender is writing a logging event (<see cref="FileAppender.MinimalLock"/>). + /// </para> + /// <para> + /// All locking strategies have issues and you should seriously consider using a different strategy that + /// avoids having multiple processes logging to the same file. /// </para> - /// <para> - /// All locking strategies have issues and you should seriously consider using a different strategy that - /// avoids having multiple processes logging to the same file. - /// </para> /// </remarks> /// <author>Nicko Cadell</author> /// <author>Gert Driesen</author> @@ -212,14 +212,14 @@ namespace log4net.Appender public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { AssertLocked(); - return m_realStream.ReadAsync(buffer, offset, count, cancellationToken); - } - - public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) - { - AssertLocked(); - return base.WriteAsync(buffer, offset, count, cancellationToken); - } + return m_realStream.ReadAsync(buffer, offset, count, cancellationToken); + } + + public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + AssertLocked(); + return base.WriteAsync(buffer, offset, count, cancellationToken); + } #endif public override void Flush() @@ -1021,10 +1021,10 @@ namespace log4net.Appender /// Gets or sets the <see cref="FileAppender.LockingModel"/> used to handle locking of the file. /// </para> /// <para> - /// There are two built in locking models, <see cref="FileAppender.ExclusiveLock"/> and <see cref="FileAppender.MinimalLock"/>. + /// There are two built in locking models, <see cref="FileAppender.ExclusiveLock"/> and <see cref="FileAppender.MinimalLock"/>. /// The first locks the file from the start of logging to the end, the /// second locks only for the minimal amount of time when logging each message - /// and the last synchronizes processes using a named system wide Mutex. + /// and the last synchronizes processes using a named system wide Mutex. /// </para> /// <para> /// The default locking model is the <see cref="FileAppender.ExclusiveLock"/>. http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/IFlushable.cs ---------------------------------------------------------------------- diff --git a/src/Appender/IFlushable.cs b/src/Appender/IFlushable.cs index 58a058c..298d96d 100644 --- a/src/Appender/IFlushable.cs +++ b/src/Appender/IFlushable.cs @@ -21,39 +21,39 @@ using System; namespace log4net.Appender { - /// <summary> - /// Interface that can be implemented by Appenders that buffer logging data and expose a <see cref="Flush"/> method. - /// </summary> - public interface IFlushable - { - /// <summary> - /// Flushes any buffered log data. - /// </summary> - /// <remarks> - /// Appenders that implement the <see cref="Flush"/> method must do so in a thread-safe manner: it can be called concurrently with - /// the <see cref="log4net.Appender.IAppender.DoAppend"/> method. - /// <para> - /// Typically this is done by locking on the Appender instance, e.g.: - /// <code> - /// <![CDATA[ - /// public bool Flush(int millisecondsTimeout) - /// { - /// lock(this) - /// { - /// // Flush buffered logging data - /// ... - /// } - /// } - /// ]]> - /// </code> - /// </para> - /// <para> - /// The <paramref name="millisecondsTimeout"/> parameter is only relevant for appenders that process logging events asynchronously, - /// such as <see cref="RemotingAppender"/>. - /// </para> - /// </remarks> - /// <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param> - /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> - bool Flush(int millisecondsTimeout); - } + /// <summary> + /// Interface that can be implemented by Appenders that buffer logging data and expose a <see cref="Flush"/> method. + /// </summary> + public interface IFlushable + { + /// <summary> + /// Flushes any buffered log data. + /// </summary> + /// <remarks> + /// Appenders that implement the <see cref="Flush"/> method must do so in a thread-safe manner: it can be called concurrently with + /// the <see cref="log4net.Appender.IAppender.DoAppend"/> method. + /// <para> + /// Typically this is done by locking on the Appender instance, e.g.: + /// <code> + /// <![CDATA[ + /// public bool Flush(int millisecondsTimeout) + /// { + /// lock(this) + /// { + /// // Flush buffered logging data + /// ... + /// } + /// } + /// ]]> + /// </code> + /// </para> + /// <para> + /// The <paramref name="millisecondsTimeout"/> parameter is only relevant for appenders that process logging events asynchronously, + /// such as <see cref="RemotingAppender"/>. + /// </para> + /// </remarks> + /// <param name="millisecondsTimeout">The maximum time to wait for logging events to be flushed.</param> + /// <returns><c>True</c> if all logging events were flushed successfully, else <c>false</c>.</returns> + bool Flush(int millisecondsTimeout); + } } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/LocalSyslogAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/LocalSyslogAppender.cs b/src/Appender/LocalSyslogAppender.cs index 469364c..5e7d5e0 100644 --- a/src/Appender/LocalSyslogAppender.cs +++ b/src/Appender/LocalSyslogAppender.cs @@ -338,9 +338,9 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 || NETSTANDARD1_3 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #endif - public override void ActivateOptions() + public override void ActivateOptions() { base.ActivateOptions(); @@ -379,12 +379,12 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 || NETSTANDARD1_3 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #endif #if !NETSTANDARD1_3 - [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] + [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif - protected override void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { int priority = GeneratePriority(m_facility, GetSeverity(loggingEvent.Level)); string message = RenderLoggingEvent(loggingEvent); @@ -403,9 +403,9 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 || NETSTANDARD1_3 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #endif - protected override void OnClose() + protected override void OnClose() { base.OnClose(); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/ManagedColoredConsoleAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/ManagedColoredConsoleAppender.cs b/src/Appender/ManagedColoredConsoleAppender.cs index 762091f..93c6c58 100644 --- a/src/Appender/ManagedColoredConsoleAppender.cs +++ b/src/Appender/ManagedColoredConsoleAppender.cs @@ -304,11 +304,11 @@ namespace log4net.Appender } private ConsoleColor foreColor; private bool hasForeColor; - internal bool HasForeColor { - get { - return hasForeColor; - } - } + internal bool HasForeColor { + get { + return hasForeColor; + } + } /// <summary> /// The mapped background color for the specified level @@ -327,12 +327,12 @@ namespace log4net.Appender set { this.backColor = value; this.hasBackColor = true; } } private ConsoleColor backColor; - private bool hasBackColor; - internal bool HasBackColor { - get { - return hasBackColor; - } - } + private bool hasBackColor; + internal bool HasBackColor { + get { + return hasBackColor; + } + } } #endregion // LevelColors LevelMapping Entry } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/MemoryAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/MemoryAppender.cs b/src/Appender/MemoryAppender.cs index ab1c0e6..48d2984 100644 --- a/src/Appender/MemoryAppender.cs +++ b/src/Appender/MemoryAppender.cs @@ -86,10 +86,10 @@ namespace log4net.Appender /// </remarks> virtual public LoggingEvent[] GetEvents() { - lock (m_eventsList.SyncRoot) - { - return (LoggingEvent[]) m_eventsList.ToArray(typeof(LoggingEvent)); - } + lock (m_eventsList.SyncRoot) + { + return (LoggingEvent[]) m_eventsList.ToArray(typeof(LoggingEvent)); + } } /// <summary> @@ -160,10 +160,10 @@ namespace log4net.Appender // volatile data in the event. loggingEvent.Fix = this.Fix; - lock (m_eventsList.SyncRoot) - { - m_eventsList.Add(loggingEvent); - } + lock (m_eventsList.SyncRoot) + { + m_eventsList.Add(loggingEvent); + } } #endregion Override implementation of AppenderSkeleton @@ -178,30 +178,30 @@ namespace log4net.Appender /// </remarks> virtual public void Clear() { - lock (m_eventsList.SyncRoot) - { - m_eventsList.Clear(); - } + lock (m_eventsList.SyncRoot) + { + m_eventsList.Clear(); + } } - /// <summary> - /// Gets the events that have been logged and clears the list of events. - /// </summary> - /// <returns>The events that have been logged</returns> - /// <remarks> - /// <para> - /// Gets the events that have been logged and clears the list of events. - /// </para> - /// </remarks> - virtual public LoggingEvent[] PopAllEvents() - { - lock (m_eventsList.SyncRoot) - { - LoggingEvent[] tmp = (LoggingEvent[]) m_eventsList.ToArray(typeof (LoggingEvent)); - m_eventsList.Clear(); - return tmp; - } - } + /// <summary> + /// Gets the events that have been logged and clears the list of events. + /// </summary> + /// <returns>The events that have been logged</returns> + /// <remarks> + /// <para> + /// Gets the events that have been logged and clears the list of events. + /// </para> + /// </remarks> + virtual public LoggingEvent[] PopAllEvents() + { + lock (m_eventsList.SyncRoot) + { + LoggingEvent[] tmp = (LoggingEvent[]) m_eventsList.ToArray(typeof (LoggingEvent)); + m_eventsList.Clear(); + return tmp; + } + } #endregion Public Instance Methods http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/NetSendAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/NetSendAppender.cs b/src/Appender/NetSendAppender.cs index d6d0635..1a9f9c0 100644 --- a/src/Appender/NetSendAppender.cs +++ b/src/Appender/NetSendAppender.cs @@ -305,12 +305,12 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 || NETSTANDARD1_3 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #endif #if !NETSTANDARD1_3 - [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] + [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif - protected override void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { NativeError nativeError = null; http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/OutputDebugStringAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/OutputDebugStringAppender.cs b/src/Appender/OutputDebugStringAppender.cs index 85a8dce..5403a49 100644 --- a/src/Appender/OutputDebugStringAppender.cs +++ b/src/Appender/OutputDebugStringAppender.cs @@ -76,11 +76,11 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 || NETSTANDARD1_3 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #elif !NETCF - [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] + [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif - override protected void Append(LoggingEvent loggingEvent) + override protected void Append(LoggingEvent loggingEvent) { #if NETSTANDARD1_3 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/RemoteSyslogAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/RemoteSyslogAppender.cs b/src/Appender/RemoteSyslogAppender.cs index c4d4c71..e8aeed3 100644 --- a/src/Appender/RemoteSyslogAppender.cs +++ b/src/Appender/RemoteSyslogAppender.cs @@ -344,88 +344,88 @@ namespace log4net.Appender /// </remarks> protected override void Append(LoggingEvent loggingEvent) { - try - { - // Priority - int priority = GeneratePriority(m_facility, GetSeverity(loggingEvent.Level)); - - // Identity - string identity; - - if (m_identity != null) - { - identity = m_identity.Format(loggingEvent); - } - else - { - identity = loggingEvent.Domain; - } - - // Message. The message goes after the tag/identity - string message = RenderLoggingEvent(loggingEvent); - - Byte[] buffer; - int i = 0; - char c; - - StringBuilder builder = new StringBuilder(); - - while (i < message.Length) - { - // Clear StringBuilder - builder.Length = 0; - - // Write priority - builder.Append('<'); - builder.Append(priority); - builder.Append('>'); - - // Write identity - builder.Append(identity); - builder.Append(": "); - - for (; i < message.Length; i++) - { - c = message[i]; - - // Accept only visible ASCII characters and space. See RFC 3164 section 4.1.3 - if (((int)c >= 32) && ((int)c <= 126)) - { - builder.Append(c); - } - // If character is newline, break and send the current line - else if ((c == '\r') || (c == '\n')) - { - // Check the next character to handle \r\n or \n\r - if ((message.Length > i + 1) && ((message[i + 1] == '\r') || (message[i + 1] == '\n'))) - { - i++; - } - i++; - break; - } - } - - // Grab as a byte array - buffer = this.Encoding.GetBytes(builder.ToString()); + try + { + // Priority + int priority = GeneratePriority(m_facility, GetSeverity(loggingEvent.Level)); + + // Identity + string identity; + + if (m_identity != null) + { + identity = m_identity.Format(loggingEvent); + } + else + { + identity = loggingEvent.Domain; + } + + // Message. The message goes after the tag/identity + string message = RenderLoggingEvent(loggingEvent); + + Byte[] buffer; + int i = 0; + char c; + + StringBuilder builder = new StringBuilder(); + + while (i < message.Length) + { + // Clear StringBuilder + builder.Length = 0; + + // Write priority + builder.Append('<'); + builder.Append(priority); + builder.Append('>'); + + // Write identity + builder.Append(identity); + builder.Append(": "); + + for (; i < message.Length; i++) + { + c = message[i]; + + // Accept only visible ASCII characters and space. See RFC 3164 section 4.1.3 + if (((int)c >= 32) && ((int)c <= 126)) + { + builder.Append(c); + } + // If character is newline, break and send the current line + else if ((c == '\r') || (c == '\n')) + { + // Check the next character to handle \r\n or \n\r + if ((message.Length > i + 1) && ((message[i + 1] == '\r') || (message[i + 1] == '\n'))) + { + i++; + } + i++; + break; + } + } + + // Grab as a byte array + buffer = this.Encoding.GetBytes(builder.ToString()); #if NETSTANDARD1_3 - Client.SendAsync(buffer, buffer.Length, RemoteEndPoint).Wait(); + Client.SendAsync(buffer, buffer.Length, RemoteEndPoint).Wait(); #else - this.Client.Send(buffer, buffer.Length, this.RemoteEndPoint); + this.Client.Send(buffer, buffer.Length, this.RemoteEndPoint); #endif - } - } - catch (Exception e) - { - ErrorHandler.Error( - "Unable to send logging event to remote syslog " - this.RemoteAddress.ToString() - " on port " - this.RemotePort + ".", - e, - ErrorCode.WriteFailure); - } + } + } + catch (Exception e) + { + ErrorHandler.Error( + "Unable to send logging event to remote syslog " + this.RemoteAddress.ToString() + " on port " + this.RemotePort + ".", + e, + ErrorCode.WriteFailure); + } } /// <summary> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/RemotingAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/RemotingAppender.cs b/src/Appender/RemotingAppender.cs index 1861cf7..3dfdef4 100644 --- a/src/Appender/RemotingAppender.cs +++ b/src/Appender/RemotingAppender.cs @@ -139,9 +139,9 @@ namespace log4net.Appender /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 - [System.Security.SecuritySafeCritical] + [System.Security.SecuritySafeCritical] #endif - override public void ActivateOptions() + override public void ActivateOptions() { base.ActivateOptions(); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/SmtpAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/SmtpAppender.cs b/src/Appender/SmtpAppender.cs index ecfd831..5cb4741 100644 --- a/src/Appender/SmtpAppender.cs +++ b/src/Appender/SmtpAppender.cs @@ -93,20 +93,20 @@ namespace log4net.Appender /// Gets or sets a comma- or semicolon-delimited list of recipient e-mail addresses (use semicolon on .NET 1.1 and comma for later versions). /// </summary> /// <value> - /// <para> - /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. - /// </para> - /// <para> - /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. - /// </para> + /// <para> + /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. + /// </para> + /// <para> + /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. + /// </para> /// </value> /// <remarks> - /// <para> - /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. - /// </para> - /// <para> - /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. - /// </para> + /// <para> + /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. + /// </para> + /// <para> + /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. + /// </para> /// </remarks> public string To { @@ -114,49 +114,49 @@ namespace log4net.Appender set { m_to = MaybeTrimSeparators(value); } } - /// <summary> - /// Gets or sets a comma- or semicolon-delimited list of recipient e-mail addresses - /// that will be carbon copied (use semicolon on .NET 1.1 and comma for later versions). - /// </summary> - /// <value> - /// <para> - /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. - /// </para> - /// <para> - /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. - /// </para> - /// </value> - /// <remarks> - /// <para> - /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. - /// </para> - /// <para> - /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. - /// </para> - /// </remarks> - public string Cc - { - get { return m_cc; } - set { m_cc = MaybeTrimSeparators(value); } - } - - /// <summary> - /// Gets or sets a semicolon-delimited list of recipient e-mail addresses - /// that will be blind carbon copied. - /// </summary> - /// <value> - /// A semicolon-delimited list of e-mail addresses. - /// </value> - /// <remarks> - /// <para> - /// A semicolon-delimited list of recipient e-mail addresses. - /// </para> - /// </remarks> - public string Bcc - { - get { return m_bcc; } - set { m_bcc = MaybeTrimSeparators(value); } - } + /// <summary> + /// Gets or sets a comma- or semicolon-delimited list of recipient e-mail addresses + /// that will be carbon copied (use semicolon on .NET 1.1 and comma for later versions). + /// </summary> + /// <value> + /// <para> + /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. + /// </para> + /// <para> + /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. + /// </para> + /// </value> + /// <remarks> + /// <para> + /// For .NET 1.1 (System.Web.Mail): A semicolon-delimited list of e-mail addresses. + /// </para> + /// <para> + /// For .NET 2.0 (System.Net.Mail): A comma-delimited list of e-mail addresses. + /// </para> + /// </remarks> + public string Cc + { + get { return m_cc; } + set { m_cc = MaybeTrimSeparators(value); } + } + + /// <summary> + /// Gets or sets a semicolon-delimited list of recipient e-mail addresses + /// that will be blind carbon copied. + /// </summary> + /// <value> + /// A semicolon-delimited list of e-mail addresses. + /// </value> + /// <remarks> + /// <para> + /// A semicolon-delimited list of recipient e-mail addresses. + /// </para> + /// </remarks> + public string Bcc + { + get { return m_bcc; } + set { m_bcc = MaybeTrimSeparators(value); } + } /// <summary> /// Gets or sets the e-mail address of the sender. @@ -325,29 +325,29 @@ namespace log4net.Appender } #if NET_2_0 || MONO_2_0 - /// <summary> - /// Enable or disable use of SSL when sending e-mail message - /// </summary> - /// <remarks> - /// This is available on MS .NET 2.0 runtime and higher - /// </remarks> - public bool EnableSsl - { - get { return m_enableSsl; } - set { m_enableSsl = value; } - } - - /// <summary> - /// Gets or sets the reply-to e-mail address. - /// </summary> - /// <remarks> - /// This is available on MS .NET 2.0 runtime and higher - /// </remarks> - public string ReplyTo - { - get { return m_replyTo; } - set { m_replyTo = value; } - } + /// <summary> + /// Enable or disable use of SSL when sending e-mail message + /// </summary> + /// <remarks> + /// This is available on MS .NET 2.0 runtime and higher + /// </remarks> + public bool EnableSsl + { + get { return m_enableSsl; } + set { m_enableSsl = value; } + } + + /// <summary> + /// Gets or sets the reply-to e-mail address. + /// </summary> + /// <remarks> + /// This is available on MS .NET 2.0 runtime and higher + /// </remarks> + public string ReplyTo + { + get { return m_replyTo; } + set { m_replyTo = value; } + } #endif /// <summary> @@ -457,7 +457,7 @@ namespace log4net.Appender } smtpClient.Port = m_port; smtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; - smtpClient.EnableSsl = m_enableSsl; + smtpClient.EnableSsl = m_enableSsl; if (m_authentication == SmtpAuthentication.Basic) { @@ -470,38 +470,38 @@ namespace log4net.Appender smtpClient.Credentials = System.Net.CredentialCache.DefaultNetworkCredentials; } - using (MailMessage mailMessage = new MailMessage()) - { - mailMessage.Body = messageBody; + using (MailMessage mailMessage = new MailMessage()) + { + mailMessage.Body = messageBody; mailMessage.BodyEncoding = m_bodyEncoding; - mailMessage.From = new MailAddress(m_from); - mailMessage.To.Add(m_to); - if (!String.IsNullOrEmpty(m_cc)) - { - mailMessage.CC.Add(m_cc); - } - if (!String.IsNullOrEmpty(m_bcc)) - { - mailMessage.Bcc.Add(m_bcc); - } - if (!String.IsNullOrEmpty(m_replyTo)) - { - // .NET 4.0 warning CS0618: 'System.Net.Mail.MailMessage.ReplyTo' is obsolete: - // 'ReplyTo is obsoleted for this type. Please use ReplyToList instead which can accept multiple addresses. http://go.microsoft.com/fwlink/?linkid=14202' + mailMessage.From = new MailAddress(m_from); + mailMessage.To.Add(m_to); + if (!String.IsNullOrEmpty(m_cc)) + { + mailMessage.CC.Add(m_cc); + } + if (!String.IsNullOrEmpty(m_bcc)) + { + mailMessage.Bcc.Add(m_bcc); + } + if (!String.IsNullOrEmpty(m_replyTo)) + { + // .NET 4.0 warning CS0618: 'System.Net.Mail.MailMessage.ReplyTo' is obsolete: + // 'ReplyTo is obsoleted for this type. Please use ReplyToList instead which can accept multiple addresses. http://go.microsoft.com/fwlink/?linkid=14202' #if !NET_4_0 && !MONO_4_0 - mailMessage.ReplyTo = new MailAddress(m_replyTo); + mailMessage.ReplyTo = new MailAddress(m_replyTo); #else - mailMessage.ReplyToList.Add(new MailAddress(m_replyTo)); + mailMessage.ReplyToList.Add(new MailAddress(m_replyTo)); #endif - } - mailMessage.Subject = m_subject; + } + mailMessage.Subject = m_subject; mailMessage.SubjectEncoding = m_subjectEncoding; - mailMessage.Priority = m_mailPriority; + mailMessage.Priority = m_mailPriority; - // TODO: Consider using SendAsync to send the message without blocking. This would be a change in - // behaviour compared to .NET 1.x. We would need a SendCompletedCallback to log errors. - smtpClient.Send(mailMessage); - } + // TODO: Consider using SendAsync to send the message without blocking. This would be a change in + // behaviour compared to .NET 1.x. We would need a SendCompletedCallback to log errors. + smtpClient.Send(mailMessage); + } #else // .NET 1.x uses the System.Web.Mail API for sending Mail @@ -510,14 +510,14 @@ namespace log4net.Appender mailMessage.BodyEncoding = m_bodyEncoding; mailMessage.From = m_from; mailMessage.To = m_to; - if (m_cc != null && m_cc.Length > 0) - { - mailMessage.Cc = m_cc; - } - if (m_bcc != null && m_bcc.Length > 0) - { - mailMessage.Bcc = m_bcc; - } + if (m_cc != null && m_cc.Length > 0) + { + mailMessage.Cc = m_cc; + } + if (m_bcc != null && m_bcc.Length > 0) + { + mailMessage.Bcc = m_bcc; + } mailMessage.Subject = m_subject; #if !MONO && !NET_1_0 && !NET_1_1 && !CLI_1_0 mailMessage.SubjectEncoding = m_subjectEncoding; @@ -586,8 +586,8 @@ namespace log4net.Appender #region Private Instance Fields private string m_to; - private string m_cc; - private string m_bcc; + private string m_cc; + private string m_bcc; private string m_from; private string m_subject; private string m_smtpHost; @@ -605,8 +605,8 @@ namespace log4net.Appender private MailPriority m_mailPriority = MailPriority.Normal; #if NET_2_0 || MONO_2_0 - private bool m_enableSsl = false; - private string m_replyTo; + private bool m_enableSsl = false; + private string m_replyTo; #endif #endregion // Private Instance Fields @@ -647,19 +647,19 @@ namespace log4net.Appender #endregion // SmtpAuthentication Enum - private static readonly char[] ADDRESS_DELIMITERS = new char[] { ',', ';' }; + private static readonly char[] ADDRESS_DELIMITERS = new char[] { ',', ';' }; - /// <summary> - /// trims leading and trailing commas or semicolons - /// </summary> - private static string MaybeTrimSeparators(string s) { + /// <summary> + /// trims leading and trailing commas or semicolons + /// </summary> + private static string MaybeTrimSeparators(string s) { #if NET_2_0 || MONO_2_0 - return string.IsNullOrEmpty(s) ? s : s.Trim(ADDRESS_DELIMITERS); + return string.IsNullOrEmpty(s) ? s : s.Trim(ADDRESS_DELIMITERS); #else - return s != null && s.Length > 0 ? s : s.Trim(ADDRESS_DELIMITERS); + return s != null && s.Length > 0 ? s : s.Trim(ADDRESS_DELIMITERS); #endif - } - } + } + } } #endif // !NETCF && !SSCLI http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/82c3e389/src/Appender/SmtpPickupDirAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/SmtpPickupDirAppender.cs b/src/Appender/SmtpPickupDirAppender.cs index c508836..5df4819 100644 --- a/src/Appender/SmtpPickupDirAppender.cs +++ b/src/Appender/SmtpPickupDirAppender.cs @@ -137,7 +137,7 @@ namespace log4net.Appender set { m_pickupDir = value; } } - /// <summary> + /// <summary> /// Gets or sets the file extension for the generated files /// </summary> /// <value>
