http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/FileAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/FileAppender.cs b/src/Appender/FileAppender.cs index 41616b9..5d0a8e3 100644 --- a/src/Appender/FileAppender.cs +++ b/src/Appender/FileAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -40,9 +40,9 @@ namespace log4net.Appender /// the <see cref="File"/> property. /// </para> /// <para> - /// The file can be opened in either append or overwrite mode + /// The file can be opened in either append or overwrite mode /// by specifying the <see cref="AppendToFile"/> property. - /// If the file path is relative it is taken as relative from + /// If the file path is relative it is taken as relative from /// the application base directory. The file encoding can be /// specified by setting the <see cref="Encoding"/> property. /// </para> @@ -63,7 +63,7 @@ namespace log4net.Appender /// <para> /// The <see cref="FileAppender"/> supports pluggable file locking models via /// the <see cref="LockingModel"/> property. - /// The default behavior, implemented by <see cref="FileAppender.ExclusiveLock"/> + /// 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 models only hold a /// write lock while the appender is writing a logging event (<see cref="FileAppender.MinimalLock"/>) @@ -89,9 +89,9 @@ namespace log4net.Appender /// the <see cref="File"/> property. /// </para> /// <para> - /// The file can be opened in either append or overwrite mode + /// The file can be opened in either append or overwrite mode /// by specifying the <see cref="AppendToFile"/> property. - /// If the file path is relative it is taken as relative from + /// If the file path is relative it is taken as relative from /// the application base directory. The file encoding can be /// specified by setting the <see cref="Encoding"/> property. /// </para> @@ -112,7 +112,7 @@ namespace log4net.Appender /// <para> /// The <see cref="FileAppender"/> supports pluggable file locking models via /// the <see cref="LockingModel"/> property. - /// The default behavior, implemented by <see cref="FileAppender.ExclusiveLock"/> + /// 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"/>). @@ -133,7 +133,7 @@ namespace log4net.Appender #region LockingStream Inner Class /// <summary> - /// Write only <see cref="Stream"/> that uses the <see cref="LockingModelBase"/> + /// Write only <see cref="Stream"/> that uses the <see cref="LockingModelBase"/> /// to manage access to an underlying resource. /// </summary> private sealed class LockingStream : Stream, IDisposable @@ -217,7 +217,7 @@ namespace log4net.Appender public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { - AssertLocked(); + AssertLocked(); return base.WriteAsync(buffer, offset, count, cancellationToken); } #endif @@ -379,7 +379,7 @@ namespace log4net.Appender /// <param name="encoding">The encoding to use</param> /// <remarks> /// <para> - /// Open the file specified and prepare for logging. + /// Open the file specified and prepare for logging. /// No writes will be made until <see cref="AcquireLock"/> is called. /// Must be called before any calls to <see cref="AcquireLock"/>, /// <see cref="ReleaseLock"/> and <see cref="CloseFile"/>. @@ -413,7 +413,7 @@ namespace log4net.Appender /// <returns>A stream that is ready to be written to.</returns> /// <remarks> /// <para> - /// Acquire the lock on the file in preparation for writing to it. + /// Acquire the lock on the file in preparation for writing to it. /// Return a stream pointing to the file. <see cref="ReleaseLock"/> /// must be called to release the lock on the output file. /// </para> @@ -425,7 +425,7 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// Release the lock on the file. No further writes will be made to the + /// Release the lock on the file. No further writes will be made to the /// stream until <see cref="AcquireLock"/> is called again. /// </para> /// </remarks> @@ -461,7 +461,7 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// Typically called during OpenFile or AcquireLock. + /// Typically called during OpenFile or AcquireLock. /// </para> /// <para> /// If the directory portion of the <paramref name="filename"/> does not exist, it is created @@ -512,7 +512,7 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// Open the file once for writing and hold it open until <see cref="CloseFile"/> is called. + /// Open the file once for writing and hold it open until <see cref="CloseFile"/> is called. /// Maintains an exclusive lock on the file during this time. /// </para> /// </remarks> @@ -528,7 +528,7 @@ namespace log4net.Appender /// <param name="encoding">The encoding to use</param> /// <remarks> /// <para> - /// Open the file specified and prepare for logging. + /// Open the file specified and prepare for logging. /// No writes will be made until <see cref="AcquireLock"/> is called. /// Must be called before any calls to <see cref="AcquireLock"/>, /// <see cref="ReleaseLock"/> and <see cref="CloseFile"/>. @@ -609,9 +609,9 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// Opens the file once for each <see cref="AcquireLock"/>/<see cref="ReleaseLock"/> cycle, + /// Opens the file once for each <see cref="AcquireLock"/>/<see cref="ReleaseLock"/> cycle, /// thus holding the lock for the minimal amount of time. This method of locking - /// is considerably slower than <see cref="FileAppender.ExclusiveLock"/> but allows + /// is considerably slower than <see cref="FileAppender.ExclusiveLock"/> but allows /// other processes to move/delete the log file whilst logging continues. /// </para> /// </remarks> @@ -629,7 +629,7 @@ namespace log4net.Appender /// <param name="encoding">The encoding to use</param> /// <remarks> /// <para> - /// Open the file specified and prepare for logging. + /// Open the file specified and prepare for logging. /// No writes will be made until <see cref="AcquireLock"/> is called. /// Must be called before any calls to <see cref="AcquireLock"/>, /// <see cref="ReleaseLock"/> and <see cref="CloseFile"/>. @@ -660,7 +660,7 @@ namespace log4net.Appender /// <returns>A stream that is ready to be written to.</returns> /// <remarks> /// <para> - /// Acquire the lock on the file in preparation for writing to it. + /// Acquire the lock on the file in preparation for writing to it. /// Return a stream pointing to the file. <see cref="ReleaseLock"/> /// must be called to release the lock on the output file. /// </para> @@ -687,7 +687,7 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// Release the lock on the file. No further writes will be made to the + /// Release the lock on the file. No further writes will be made to the /// stream until <see cref="AcquireLock"/> is called again. /// </para> /// </remarks> @@ -734,7 +734,7 @@ namespace log4net.Appender /// <param name="encoding">The encoding to use</param> /// <remarks> /// <para> - /// Open the file specified and prepare for logging. + /// Open the file specified and prepare for logging. /// No writes will be made until <see cref="AcquireLock"/> is called. /// Must be called before any calls to <see cref="AcquireLock"/>, /// -<see cref="ReleaseLock"/> and <see cref="CloseFile"/>. @@ -941,7 +941,7 @@ namespace log4net.Appender /// </value> /// <remarks> /// <para> - /// If the path is relative it is taken as relative from + /// If the path is relative it is taken as relative from /// the application base directory. /// </para> /// </remarks> @@ -960,7 +960,7 @@ namespace log4net.Appender /// </value> /// <remarks> /// <para> - /// If the value is set to false then the file will be overwritten, if + /// If the value is set to false then the file will be overwritten, if /// it is set to true then the file will be appended to. /// </para> /// The default value is true. @@ -1022,7 +1022,7 @@ namespace log4net.Appender /// </para> /// <para> /// 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 + /// 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. /// </para> @@ -1043,7 +1043,7 @@ namespace log4net.Appender /// </para> /// <para> /// There are three built in locking models, <see cref="FileAppender.ExclusiveLock"/>, <see cref="FileAppender.MinimalLock"/> and <see cref="FileAppender.InterProcessLock"/> . - /// The first locks the file from the start of logging to the end, the + /// 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. /// </para> @@ -1063,18 +1063,18 @@ namespace log4net.Appender #region Override implementation of AppenderSkeleton /// <summary> - /// Activate the options on the file appender. + /// Activate the options on the file appender. /// </summary> /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// <para> @@ -1156,13 +1156,13 @@ namespace log4net.Appender /// <summary> /// This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> - /// method. + /// method. /// </summary> /// <param name="loggingEvent">The event to log.</param> /// <remarks> /// <para> - /// Writes a log statement to the output stream if the output stream exists - /// and is writable. + /// Writes a log statement to the output stream if the output stream exists + /// and is writable. /// </para> /// <para> /// The format of the output will depend on the appender's layout. @@ -1185,7 +1185,7 @@ namespace log4net.Appender /// <summary> /// This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent[])"/> - /// method. + /// method. /// </summary> /// <param name="loggingEvents">The array of events to log.</param> /// <remarks> @@ -1398,7 +1398,7 @@ namespace log4net.Appender /// <remarks> /// <para> /// This implementation of <see cref="M:SetQWForFiles(Stream)"/> creates a <see cref="StreamWriter"/> - /// over the <paramref name="fileStream"/> and passes it to the + /// over the <paramref name="fileStream"/> and passes it to the /// <see cref="M:SetQWForFiles(TextWriter)"/> method. /// </para> /// <para> @@ -1440,7 +1440,7 @@ namespace log4net.Appender /// <para> /// Converts the path specified to a fully /// qualified path. If the path is relative it is - /// taken as relative from the application base + /// taken as relative from the application base /// directory. /// </para> /// </remarks>
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/ForwardingAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/ForwardingAppender.cs b/src/Appender/ForwardingAppender.cs index 681f812..77240e8 100644 --- a/src/Appender/ForwardingAppender.cs +++ b/src/Appender/ForwardingAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -61,7 +61,7 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// Releases any resources allocated within the appender such as file handles, + /// Releases any resources allocated within the appender such as file handles, /// network connections, etc. /// </para> /// <para> @@ -81,7 +81,7 @@ namespace log4net.Appender } /// <summary> - /// Forward the logging event to the attached appenders + /// Forward the logging event to the attached appenders /// </summary> /// <param name="loggingEvent">The event to log.</param> /// <remarks> @@ -89,17 +89,17 @@ namespace log4net.Appender /// Delivers the logging event to all the attached appenders. /// </para> /// </remarks> - override protected void Append(LoggingEvent loggingEvent) + override protected void Append(LoggingEvent loggingEvent) { // Pass the logging event on the the attached appenders if (m_appenderAttachedImpl != null) { m_appenderAttachedImpl.AppendLoopOnAppenders(loggingEvent); } - } + } /// <summary> - /// Forward the logging events to the attached appenders + /// Forward the logging events to the attached appenders /// </summary> /// <param name="loggingEvents">The array of events to log.</param> /// <remarks> @@ -107,14 +107,14 @@ namespace log4net.Appender /// Delivers the logging events to all the attached appenders. /// </para> /// </remarks> - override protected void Append(LoggingEvent[] loggingEvents) + override protected void Append(LoggingEvent[] loggingEvents) { // Pass the logging event on the the attached appenders if (m_appenderAttachedImpl != null) { m_appenderAttachedImpl.AppendLoopOnAppenders(loggingEvents); } - } + } #endregion Override implementation of AppenderSkeleton @@ -131,7 +131,7 @@ namespace log4net.Appender /// appenders, then it won't be added again. /// </para> /// </remarks> - virtual public void AddAppender(IAppender newAppender) + virtual public void AddAppender(IAppender newAppender) { if (newAppender == null) { @@ -139,7 +139,7 @@ namespace log4net.Appender } lock(this) { - if (m_appenderAttachedImpl == null) + if (m_appenderAttachedImpl == null) { m_appenderAttachedImpl = new log4net.Util.AppenderAttachedImpl(); } @@ -148,17 +148,17 @@ namespace log4net.Appender } /// <summary> - /// Gets the appenders contained in this appender as an + /// Gets the appenders contained in this appender as an /// <see cref="System.Collections.ICollection"/>. /// </summary> /// <remarks> - /// If no appenders can be found, then an <see cref="EmptyCollection"/> + /// If no appenders can be found, then an <see cref="EmptyCollection"/> /// is returned. /// </remarks> /// <returns> /// A collection of the appenders in this appender. /// </returns> - virtual public AppenderCollection Appenders + virtual public AppenderCollection Appenders { get { @@ -168,7 +168,7 @@ namespace log4net.Appender { return AppenderCollection.EmptyCollection; } - else + else { return m_appenderAttachedImpl.Appenders; } @@ -188,7 +188,7 @@ namespace log4net.Appender /// Get the named appender attached to this appender. /// </para> /// </remarks> - virtual public IAppender GetAppender(string name) + virtual public IAppender GetAppender(string name) { lock(this) { @@ -209,11 +209,11 @@ namespace log4net.Appender /// This is useful when re-reading configuration information. /// </para> /// </remarks> - virtual public void RemoveAllAppenders() + virtual public void RemoveAllAppenders() { lock(this) { - if (m_appenderAttachedImpl != null) + if (m_appenderAttachedImpl != null) { m_appenderAttachedImpl.RemoveAllAppenders(); m_appenderAttachedImpl = null; @@ -231,11 +231,11 @@ namespace log4net.Appender /// If you are discarding the appender you must call /// <see cref="IAppender.Close"/> on the appender removed. /// </remarks> - virtual public IAppender RemoveAppender(IAppender appender) + virtual public IAppender RemoveAppender(IAppender appender) { lock(this) { - if (appender != null && m_appenderAttachedImpl != null) + if (appender != null && m_appenderAttachedImpl != null) { return m_appenderAttachedImpl.RemoveAppender(appender); } @@ -253,7 +253,7 @@ namespace log4net.Appender /// If you are discarding the appender you must call /// <see cref="IAppender.Close"/> on the appender removed. /// </remarks> - virtual public IAppender RemoveAppender(string name) + virtual public IAppender RemoveAppender(string name) { lock(this) { @@ -264,7 +264,7 @@ namespace log4net.Appender } return null; } - + #endregion Implementation of IAppenderAttachable #region Private Instance Fields http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/IAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/IAppender.cs b/src/Appender/IAppender.cs index a644f07..9af7ebd 100644 --- a/src/Appender/IAppender.cs +++ b/src/Appender/IAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -46,7 +46,7 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// Releases any resources allocated within the appender such as file handles, + /// Releases any resources allocated within the appender such as file handles, /// network connections, etc. /// </para> /// <para> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/IBulkAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/IBulkAppender.cs b/src/Appender/IBulkAppender.cs index 469eb85..2d24fc0 100644 --- a/src/Appender/IBulkAppender.cs +++ b/src/Appender/IBulkAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/IFlushable.cs ---------------------------------------------------------------------- diff --git a/src/Appender/IFlushable.cs b/src/Appender/IFlushable.cs index 2cb7ae3..58a058c 100644 --- a/src/Appender/IFlushable.cs +++ b/src/Appender/IFlushable.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/LocalSyslogAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/LocalSyslogAppender.cs b/src/Appender/LocalSyslogAppender.cs index a21d7ed..469364c 100644 --- a/src/Appender/LocalSyslogAppender.cs +++ b/src/Appender/LocalSyslogAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -29,7 +29,7 @@ using log4net.Appender; using log4net.Util; using log4net.Layout; -namespace log4net.Appender +namespace log4net.Appender { /// <summary> /// Logs events to a local syslog service. @@ -40,7 +40,7 @@ namespace log4net.Appender /// If these functions are not available on the local system then this appender will not work! /// </note> /// <para> - /// The functions <c>openlog</c>, <c>syslog</c>, and <c>closelog</c> are specified in SUSv2 and + /// The functions <c>openlog</c>, <c>syslog</c>, and <c>closelog</c> are specified in SUSv2 and /// POSIX 1003.1-2001 standards. These are used to log messages to the local syslog service. /// </para> /// <para> @@ -51,20 +51,20 @@ namespace log4net.Appender /// <para> /// Syslog messages must have a facility and and a severity. The severity /// is derived from the Level of the logging event. - /// The facility must be chosen from the set of defined syslog + /// The facility must be chosen from the set of defined syslog /// <see cref="SyslogFacility"/> values. The facilities list is predefined /// and cannot be extended. /// </para> /// <para> /// An identifier is specified with each log message. This can be specified - /// by setting the <see cref="Identity"/> property. The identity (also know + /// by setting the <see cref="Identity"/> property. The identity (also know /// as the tag) must not contain white space. The default value for the /// identity is the application name (from <see cref="SystemInfo.ApplicationFriendlyName"/>). /// </para> /// </remarks> /// <author>Rob Lyon</author> /// <author>Nicko Cadell</author> - public class LocalSyslogAppender : AppenderSkeleton + public class LocalSyslogAppender : AppenderSkeleton { #region Enumerations @@ -261,24 +261,24 @@ namespace log4net.Appender /// Initializes a new instance of the <see cref="LocalSyslogAppender" /> class. /// </summary> /// <remarks> - /// This instance of the <see cref="LocalSyslogAppender" /> class is set up to write + /// This instance of the <see cref="LocalSyslogAppender" /> class is set up to write /// to a local syslog service. /// </remarks> - public LocalSyslogAppender() + public LocalSyslogAppender() { } #endregion // Public Instance Constructors #region Public Instance Properties - + /// <summary> /// Message identity /// </summary> /// <remarks> /// <para> /// An identifier is specified with each log message. This can be specified - /// by setting the <see cref="Identity"/> property. The identity (also know + /// by setting the <see cref="Identity"/> property. The identity (also know /// as the tag) must not contain white space. The default value for the /// identity is the application name (from <see cref="SystemInfo.ApplicationFriendlyName"/>). /// </para> @@ -302,7 +302,7 @@ namespace log4net.Appender get { return m_facility; } set { m_facility = value; } } - + #endregion // Public Instance Properties /// <summary> @@ -327,13 +327,13 @@ namespace log4net.Appender /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> @@ -343,7 +343,7 @@ namespace log4net.Appender public override void ActivateOptions() { base.ActivateOptions(); - + m_levelMapping.ActivateOptions(); string identString = m_identity; @@ -384,7 +384,7 @@ namespace log4net.Appender #if !NETSTANDARD1_3 [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); @@ -418,7 +418,7 @@ namespace log4net.Appender { // Ignore dll not found at this point } - + if (m_handleToIdentity != IntPtr.Zero) { // free global ident @@ -466,30 +466,30 @@ namespace log4net.Appender // Fallback to sensible default values // - if (level >= Level.Alert) + if (level >= Level.Alert) { return SyslogSeverity.Alert; - } - else if (level >= Level.Critical) + } + else if (level >= Level.Critical) { return SyslogSeverity.Critical; - } - else if (level >= Level.Error) + } + else if (level >= Level.Error) { return SyslogSeverity.Error; - } - else if (level >= Level.Warn) + } + else if (level >= Level.Warn) { return SyslogSeverity.Warning; - } - else if (level >= Level.Notice) + } + else if (level >= Level.Notice) { return SyslogSeverity.Notice; - } - else if (level >= Level.Info) + } + else if (level >= Level.Info) { return SyslogSeverity.Informational; - } + } // Default setting return SyslogSeverity.Debug; } @@ -538,7 +538,7 @@ namespace log4net.Appender #endregion // Private Instances Fields #region External Members - + /// <summary> /// Open connection to system logger. /// </summary> @@ -553,7 +553,7 @@ namespace log4net.Appender /// The libc syslog method takes a format string and a variable argument list similar /// to the classic printf function. As this type of vararg list is not supported /// by C# we need to specify the arguments explicitly. Here we have specified the - /// format string with a single message argument. The caller must set the format + /// format string with a single message argument. The caller must set the format /// string to <c>"%s"</c>. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/ManagedColoredConsoleAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/ManagedColoredConsoleAppender.cs b/src/Appender/ManagedColoredConsoleAppender.cs index 9efe65d..762091f 100644 --- a/src/Appender/ManagedColoredConsoleAppender.cs +++ b/src/Appender/ManagedColoredConsoleAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -20,7 +20,7 @@ // Compatibility: // http://msdn.microsoft.com/en-us/library/system.console.foregroundcolor.aspx // Disable for unsupported targets -#if !NETCF +#if !NETCF #if !SSCLI #if !CLI_1_0 #if !MONO_1_0 @@ -55,7 +55,7 @@ namespace log4net.Appender /// <remarks> /// <para> /// ManagedColoredConsoleAppender appends log events to the standard output stream - /// or the error output stream using a layout specified by the + /// or the error output stream using a layout specified by the /// user. It also allows the color of a specific type of message to be set. /// </para> /// <para> @@ -104,13 +104,13 @@ namespace log4net.Appender /// Initializes a new instance of the <see cref="ManagedColoredConsoleAppender" /> class. /// </summary> /// <remarks> - /// The instance of the <see cref="ManagedColoredConsoleAppender" /> class is set up to write + /// The instance of the <see cref="ManagedColoredConsoleAppender" /> class is set up to write /// to the standard output stream. /// </remarks> - public ManagedColoredConsoleAppender() + public ManagedColoredConsoleAppender() { } - + #region Public Instance Properties /// <summary> /// Target is the value of the console output stream. @@ -136,8 +136,8 @@ namespace log4net.Appender if (SystemInfo.EqualsIgnoringCase(ConsoleError, v)) { m_writeToErrorStream = true; - } - else + } + else { m_writeToErrorStream = false; } @@ -174,18 +174,18 @@ namespace log4net.Appender /// The format of the output will depend on the appender's layout. /// </para> /// </remarks> - override protected void Append(log4net.Core.LoggingEvent loggingEvent) + override protected void Append(log4net.Core.LoggingEvent loggingEvent) { System.IO.TextWriter writer; - + if (m_writeToErrorStream) writer = Console.Error; else writer = Console.Out; - + // Reset color Console.ResetColor(); - + // see if there is a specified lookup LevelColors levelColors = m_levelMapping.Lookup(loggingEvent.Level) as LevelColors; if (levelColors != null) @@ -197,7 +197,7 @@ namespace log4net.Appender if (levelColors.HasForeColor) Console.ForegroundColor = levelColors.ForeColor; } - + // Render the event to a string string strLoggingMessage = RenderLoggingEvent(loggingEvent); // and write it @@ -238,24 +238,24 @@ namespace log4net.Appender #region Public Static Fields /// <summary> - /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console + /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console /// standard output stream. /// </summary> /// <remarks> /// <para> - /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console + /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console /// standard output stream. /// </para> /// </remarks> public const string ConsoleOut = "Console.Out"; /// <summary> - /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console + /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console /// standard error output stream. /// </summary> /// <remarks> /// <para> - /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console + /// The <see cref="ManagedColoredConsoleAppender.Target"/> to use when writing to the Console /// standard error output stream. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/MemoryAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/MemoryAppender.cs b/src/Appender/MemoryAppender.cs index e0ec741..ab1c0e6 100644 --- a/src/Appender/MemoryAppender.cs +++ b/src/Appender/MemoryAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -93,17 +93,17 @@ namespace log4net.Appender } /// <summary> - /// Gets or sets a value indicating whether only part of the logging event + /// Gets or sets a value indicating whether only part of the logging event /// data should be fixed. /// </summary> /// <value> - /// <c>true</c> if the appender should only fix part of the logging event + /// <c>true</c> if the appender should only fix part of the logging event /// data, otherwise <c>false</c>. The default is <c>false</c>. /// </value> /// <remarks> /// <para> - /// Setting this property to <c>true</c> will cause only part of the event - /// data to be fixed and stored in the appender, hereby improving performance. + /// Setting this property to <c>true</c> will cause only part of the event + /// data to be fixed and stored in the appender, hereby improving performance. /// </para> /// <para> /// See <see cref="M:LoggingEvent.FixVolatileData(bool)"/> for more information. @@ -113,8 +113,8 @@ namespace log4net.Appender virtual public bool OnlyFixPartialEventData { get { return (Fix == FixFlags.Partial); } - set - { + set + { if (value) { Fix = FixFlags.Partial; @@ -131,7 +131,7 @@ namespace log4net.Appender /// </summary> /// <remarks> /// <para> - /// The logging event needs to have certain thread specific values + /// The logging event needs to have certain thread specific values /// captured before it can be buffered. See <see cref="LoggingEvent.Fix"/> /// for details. /// </para> @@ -147,13 +147,13 @@ namespace log4net.Appender #region Override implementation of AppenderSkeleton /// <summary> - /// This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method. + /// This method is called by the <see cref="M:AppenderSkeleton.DoAppend(LoggingEvent)"/> method. /// </summary> /// <param name="loggingEvent">the event to log</param> /// <remarks> /// <para>Stores the <paramref name="loggingEvent"/> in the events list.</para> /// </remarks> - override protected void Append(LoggingEvent loggingEvent) + override protected void Append(LoggingEvent loggingEvent) { // Because we are caching the LoggingEvent beyond the // lifetime of the Append() method we must fix any @@ -164,7 +164,7 @@ namespace log4net.Appender { m_eventsList.Add(loggingEvent); } - } + } #endregion Override implementation of AppenderSkeleton http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/NetSendAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/NetSendAppender.cs b/src/Appender/NetSendAppender.cs index ae8b7a9..d6d0635 100644 --- a/src/Appender/NetSendAppender.cs +++ b/src/Appender/NetSendAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -20,9 +20,9 @@ // MONO 1.0 Beta mcs does not like #if !A && !B && !C syntax // .NET Compact Framework 1.0 has no support for Win32 NetMessageBufferSend API -#if !NETCF +#if !NETCF // MONO 1.0 has no support for Win32 NetMessageBufferSend API -#if !MONO +#if !MONO // SSCLI 1.0 has no support for Win32 NetMessageBufferSend API #if !SSCLI // We don't want framework or platform specific code in the CLI version of log4net @@ -37,22 +37,22 @@ using log4net.Layout; using log4net.Core; -namespace log4net.Appender +namespace log4net.Appender { /// <summary> - /// Logs entries by sending network messages using the + /// Logs entries by sending network messages using the /// <see cref="NetMessageBufferSend" /> native function. /// </summary> /// <remarks> /// <para> - /// You can send messages only to names that are active - /// on the network. If you send the message to a user name, - /// that user must be logged on and running the Messenger + /// You can send messages only to names that are active + /// on the network. If you send the message to a user name, + /// that user must be logged on and running the Messenger /// service to receive the message. /// </para> /// <para> - /// The receiver will get a top most window displaying the - /// messages one at a time, therefore this appender should + /// The receiver will get a top most window displaying the + /// messages one at a time, therefore this appender should /// not be used to deliver a high volume of messages. /// </para> /// <para> @@ -119,15 +119,15 @@ namespace log4net.Appender /// </list> /// </para> /// <para> - /// <b>Note :</b> security restrictions apply for sending - /// network messages, see <see cref="NetMessageBufferSend" /> + /// <b>Note :</b> security restrictions apply for sending + /// network messages, see <see cref="NetMessageBufferSend" /> /// for more information. /// </para> /// </remarks> /// <example> /// <para> - /// An example configuration section to log information - /// using this appender from the local machine, named + /// An example configuration section to log information + /// using this appender from the local machine, named /// LOCAL_PC, to machine OPERATOR_PC : /// </para> /// <code lang="XML" escaped="true"> @@ -140,7 +140,7 @@ namespace log4net.Appender /// </example> /// <author>Nicko Cadell</author> /// <author>Gert Driesen</author> - public class NetSendAppender : AppenderSkeleton + public class NetSendAppender : AppenderSkeleton { #region Member Variables @@ -174,7 +174,7 @@ namespace log4net.Appender /// <remarks> /// The default constructor initializes all fields to their default values. /// </remarks> - public NetSendAppender() + public NetSendAppender() { } @@ -191,7 +191,7 @@ namespace log4net.Appender /// <remarks> /// If this property is not specified, the message is sent from the local computer. /// </remarks> - public string Sender + public string Sender { get { return m_sender; } set { m_sender = value; } @@ -206,12 +206,12 @@ namespace log4net.Appender /// <remarks> /// This property should always be specified in order to send a message. /// </remarks> - public string Recipient + public string Recipient { get { return m_recipient; } set { m_recipient = value; } } - + /// <summary> /// Gets or sets the DNS or NetBIOS name of the remote server on which the function is to execute. /// </summary> @@ -223,10 +223,10 @@ namespace log4net.Appender /// For Windows NT 4.0 and earlier, the string should begin with \\. /// </para> /// <para> - /// If this property is not specified, the local computer is used. + /// If this property is not specified, the local computer is used. /// </para> /// </remarks> - public string Server + public string Server { get { return m_server; } set { m_server = value; } @@ -246,7 +246,7 @@ namespace log4net.Appender /// of the current thread. /// </para> /// </remarks> - public SecurityContext SecurityContext + public SecurityContext SecurityContext { get { return m_securityContext; } set { m_securityContext = value; } @@ -262,13 +262,13 @@ namespace log4net.Appender /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// <para> @@ -279,8 +279,8 @@ namespace log4net.Appender public override void ActivateOptions() { base.ActivateOptions(); - - if (this.Recipient == null) + + if (this.Recipient == null) { throw new ArgumentNullException("Recipient", "The required property 'Recipient' was not specified."); } @@ -310,7 +310,7 @@ namespace log4net.Appender #if !NETSTANDARD1_3 [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; @@ -320,10 +320,10 @@ namespace log4net.Appender using(m_securityContext.Impersonate(this)) { // Send the message - int returnValue = NetMessageBufferSend(this.Server, this.Recipient, this.Sender, renderedLoggingEvent, renderedLoggingEvent.Length * Marshal.SystemDefaultCharSize); + int returnValue = NetMessageBufferSend(this.Server, this.Recipient, this.Sender, renderedLoggingEvent, renderedLoggingEvent.Length * Marshal.SystemDefaultCharSize); // Log the error if the message could not be sent - if (returnValue != 0) + if (returnValue != 0) { // Lookup the native error nativeError = NativeError.GetError(returnValue); @@ -380,7 +380,7 @@ namespace log4net.Appender /// No special group membership is required to send a network message. /// </para> /// <para> - /// Admin, Accounts, Print, or Server Operator group membership is required to + /// Admin, Accounts, Print, or Server Operator group membership is required to /// successfully send a network message on a remote server. /// </para> /// </description> @@ -389,12 +389,12 @@ namespace log4net.Appender /// <term>Windows 2000 or later</term> /// <description> /// <para> - /// If you send a message on a domain controller that is running Active Directory, - /// access is allowed or denied based on the access control list (ACL) for the securable - /// object. The default ACL permits only Domain Admins and Account Operators to send a network message. + /// If you send a message on a domain controller that is running Active Directory, + /// access is allowed or denied based on the access control list (ACL) for the securable + /// object. The default ACL permits only Domain Admins and Account Operators to send a network message. /// </para> /// <para> - /// On a member server or workstation, only Administrators and Server Operators can send a network message. + /// On a member server or workstation, only Administrators and Server Operators can send a network message. /// </para> /// </description> /// </item> @@ -409,8 +409,8 @@ namespace log4net.Appender /// If the function succeeds, the return value is zero. /// </para> /// </returns> - [DllImport("netapi32.dll", SetLastError=true)] - protected static extern int NetMessageBufferSend( + [DllImport("netapi32.dll", SetLastError=true)] + protected static extern int NetMessageBufferSend( [MarshalAs(UnmanagedType.LPWStr)] string serverName, [MarshalAs(UnmanagedType.LPWStr)] string msgName, [MarshalAs(UnmanagedType.LPWStr)] string fromName, http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/OutputDebugStringAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/OutputDebugStringAppender.cs b/src/Appender/OutputDebugStringAppender.cs index cd48689..85a8dce 100644 --- a/src/Appender/OutputDebugStringAppender.cs +++ b/src/Appender/OutputDebugStringAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -40,7 +40,7 @@ namespace log4net.Appender /// OutputDebugString system. /// </para> /// <para> - /// The string is passed to the native <c>OutputDebugString</c> + /// The string is passed to the native <c>OutputDebugString</c> /// function. /// </para> /// </remarks> @@ -80,7 +80,7 @@ namespace log4net.Appender #elif !NETCF [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)) @@ -90,7 +90,7 @@ namespace log4net.Appender #endif OutputDebugString(RenderLoggingEvent(loggingEvent)); - } + } /// <summary> /// This appender requires a <see cref="Layout"/> to be set. http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/RemoteSyslogAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/RemoteSyslogAppender.cs b/src/Appender/RemoteSyslogAppender.cs index b7a8c66..c4d4c71 100644 --- a/src/Appender/RemoteSyslogAppender.cs +++ b/src/Appender/RemoteSyslogAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -54,13 +54,13 @@ namespace log4net.Appender /// <para> /// Syslog messages must have a facility and and a severity. The severity /// is derived from the Level of the logging event. - /// The facility must be chosen from the set of defined syslog + /// The facility must be chosen from the set of defined syslog /// <see cref="SyslogFacility"/> values. The facilities list is predefined /// and cannot be extended. /// </para> /// <para> /// An identifier is specified with each log message. This can be specified - /// by setting the <see cref="Identity"/> property. The identity (also know + /// by setting the <see cref="Identity"/> property. The identity (also know /// as the tag) must not contain white space. The default value for the /// identity is the application name (from <see cref="LoggingEvent.Domain"/>). /// </para> @@ -266,7 +266,7 @@ namespace log4net.Appender /// Initializes a new instance of the <see cref="RemoteSyslogAppender" /> class. /// </summary> /// <remarks> - /// This instance of the <see cref="RemoteSyslogAppender" /> class is set up to write + /// This instance of the <see cref="RemoteSyslogAppender" /> class is set up to write /// to a remote syslog daemon. /// </remarks> public RemoteSyslogAppender() @@ -287,7 +287,7 @@ namespace log4net.Appender /// <remarks> /// <para> /// An identifier is specified with each log message. This can be specified - /// by setting the <see cref="Identity"/> property. The identity (also know + /// by setting the <see cref="Identity"/> property. The identity (also know /// as the tag) must not contain white space. The default value for the /// identity is the application name (from <see cref="LoggingEvent.Domain"/>). /// </para> @@ -419,9 +419,9 @@ namespace log4net.Appender catch (Exception e) { ErrorHandler.Error( - "Unable to send logging event to remote syslog " + - this.RemoteAddress.ToString() + - " on port " + + "Unable to send logging event to remote syslog " + this.RemoteAddress.ToString() + " on port " this.RemotePort + ".", e, ErrorCode.WriteFailure); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/RemotingAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/RemotingAppender.cs b/src/Appender/RemotingAppender.cs index b334920..1861cf7 100644 --- a/src/Appender/RemotingAppender.cs +++ b/src/Appender/RemotingAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -33,25 +33,25 @@ using log4net.Util; namespace log4net.Appender { /// <summary> - /// Delivers logging events to a remote logging sink. + /// Delivers logging events to a remote logging sink. /// </summary> /// <remarks> /// <para> - /// This Appender is designed to deliver events to a remote sink. + /// This Appender is designed to deliver events to a remote sink. /// That is any object that implements the <see cref="IRemoteLoggingSink"/> /// interface. It delivers the events using .NET remoting. The /// object to deliver events to is specified by setting the /// appenders <see cref="RemotingAppender.Sink"/> property.</para> /// <para> - /// The RemotingAppender buffers events before sending them. This allows it to + /// The RemotingAppender buffers events before sending them. This allows it to /// make more efficient use of the remoting infrastructure.</para> /// <para> - /// Once the buffer is full the events are still not sent immediately. - /// They are scheduled to be sent using a pool thread. The effect is that - /// the send occurs asynchronously. This is very important for a - /// number of non obvious reasons. The remoting infrastructure will + /// Once the buffer is full the events are still not sent immediately. + /// They are scheduled to be sent using a pool thread. The effect is that + /// the send occurs asynchronously. This is very important for a + /// number of non obvious reasons. The remoting infrastructure will /// flow thread local variables (stored in the <see cref="CallContext"/>), - /// if they are marked as <see cref="ILogicalThreadAffinative"/>, across the + /// if they are marked as <see cref="ILogicalThreadAffinative"/>, across the /// remoting boundary. If the server is not contactable then /// the remoting infrastructure will clear the <see cref="ILogicalThreadAffinative"/> /// objects from the <see cref="CallContext"/>. To prevent a logging failure from @@ -60,9 +60,9 @@ namespace log4net.Appender /// thread is used for this. If no <see cref="ThreadPool"/> thread is available then /// the events will block in the thread pool manager until a thread is available.</para> /// <para> - /// Because the events are sent asynchronously using pool threads it is possible to close + /// Because the events are sent asynchronously using pool threads it is possible to close /// this appender before all the queued events have been sent. - /// When closing the appender attempts to wait until all the queued events have been sent, but + /// When closing the appender attempts to wait until all the queued events have been sent, but /// this will timeout after 30 seconds regardless.</para> /// <para> /// If this appender is being closed because the <see cref="AppDomain.ProcessExit"/> @@ -70,7 +70,7 @@ namespace log4net.Appender /// exit the runtime limits the time that a <see cref="AppDomain.ProcessExit"/> /// event handler is allowed to run for. If the runtime terminates the threads before /// the queued events have been sent then they will be lost. To ensure that all events - /// are sent the appender must be closed before the application exits. See + /// are sent the appender must be closed before the application exits. See /// <see cref="log4net.Core.LoggerManager.Shutdown"/> for details on how to shutdown /// log4net programmatically.</para> /// </remarks> @@ -99,7 +99,7 @@ namespace log4net.Appender #region Public Instance Properties /// <summary> - /// Gets or sets the URL of the well-known object that will accept + /// Gets or sets the URL of the well-known object that will accept /// the logging events. /// </summary> /// <value> @@ -128,24 +128,24 @@ namespace log4net.Appender /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> #if NET_4_0 || MONO_4_0 [System.Security.SecuritySafeCritical] #endif - override public void ActivateOptions() + override public void ActivateOptions() { base.ActivateOptions(); - IDictionary channelProperties = new Hashtable(); + IDictionary channelProperties = new Hashtable(); channelProperties["typeFilterLevel"] = "Full"; m_sinkObj = (IRemoteLoggingSink)Activator.GetObject(typeof(IRemoteLoggingSink), m_sinkUrl, channelProperties); @@ -163,7 +163,7 @@ namespace log4net.Appender /// using a pool thread. The effect is that the send occurs asynchronously. /// This is very important for a number of non obvious reasons. The remoting /// infrastructure will flow thread local variables (stored in the <see cref="CallContext"/>), - /// if they are marked as <see cref="ILogicalThreadAffinative"/>, across the + /// if they are marked as <see cref="ILogicalThreadAffinative"/>, across the /// remoting boundary. If the server is not contactable then /// the remoting infrastructure will clear the <see cref="ILogicalThreadAffinative"/> /// objects from the <see cref="CallContext"/>. To prevent a logging failure from @@ -199,7 +199,7 @@ namespace log4net.Appender /// it is possible to close the appender before all the queued events have been /// sent.</para> /// <para> - /// This method attempts to wait until all the queued events have been sent, but this + /// This method attempts to wait until all the queued events have been sent, but this /// method will timeout after 30 seconds regardless.</para> /// <para> /// If the appender is being closed because the <see cref="AppDomain.ProcessExit"/> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/SmtpAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/SmtpAppender.cs b/src/Appender/SmtpAppender.cs index 491807c..ecfd831 100644 --- a/src/Appender/SmtpAppender.cs +++ b/src/Appender/SmtpAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -38,7 +38,7 @@ using log4net.Util; namespace log4net.Appender { /// <summary> - /// Send an e-mail when a specific logging event occurs, typically on errors + /// Send an e-mail when a specific logging event occurs, typically on errors /// or fatal errors. /// </summary> /// <remarks> @@ -46,8 +46,8 @@ namespace log4net.Appender /// The number of logging events delivered in this e-mail depend on /// the value of <see cref="BufferingAppenderSkeleton.BufferSize"/> option. The /// <see cref="SmtpAppender"/> keeps only the last - /// <see cref="BufferingAppenderSkeleton.BufferSize"/> logging events in its - /// cyclic buffer. This keeps memory requirements at a reasonable level while + /// <see cref="BufferingAppenderSkeleton.BufferSize"/> logging events in its + /// cyclic buffer. This keeps memory requirements at a reasonable level while /// still delivering useful application context. /// </para> /// <note type="caution"> @@ -82,7 +82,7 @@ namespace log4net.Appender /// </para> /// </remarks> public SmtpAppender() - { + { } #endregion // Public Instance Constructors @@ -115,7 +115,7 @@ namespace log4net.Appender } /// <summary> - /// Gets or sets a comma- or semicolon-delimited list of recipient e-mail addresses + /// 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> @@ -169,7 +169,7 @@ namespace log4net.Appender /// The e-mail address of the sender. /// </para> /// </remarks> - public string From + public string From { get { return m_from; } set { m_from = value; } @@ -186,23 +186,23 @@ namespace log4net.Appender /// The subject line of the e-mail message. /// </para> /// </remarks> - public string Subject + public string Subject { get { return m_subject; } set { m_subject = value; } } - + /// <summary> - /// Gets or sets the name of the SMTP relay mail server to use to send + /// Gets or sets the name of the SMTP relay mail server to use to send /// the e-mail messages. /// </summary> /// <value> - /// The name of the e-mail relay server. If SmtpServer is not set, the + /// The name of the e-mail relay server. If SmtpServer is not set, the /// name of the local SMTP server is used. /// </value> /// <remarks> /// <para> - /// The name of the e-mail relay server. If SmtpServer is not set, the + /// The name of the e-mail relay server. If SmtpServer is not set, the /// name of the local SMTP server is used. /// </para> /// </remarks> @@ -216,7 +216,7 @@ namespace log4net.Appender /// Obsolete /// </summary> /// <remarks> - /// Use the BufferingAppenderSkeleton Fix methods instead + /// Use the BufferingAppenderSkeleton Fix methods instead /// </remarks> /// <remarks> /// <para> @@ -236,13 +236,13 @@ namespace log4net.Appender /// <remarks> /// <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note> /// <para> - /// Valid Authentication mode values are: <see cref="SmtpAuthentication.None"/>, - /// <see cref="SmtpAuthentication.Basic"/>, and <see cref="SmtpAuthentication.Ntlm"/>. - /// The default value is <see cref="SmtpAuthentication.None"/>. When using - /// <see cref="SmtpAuthentication.Basic"/> you must specify the <see cref="Username"/> + /// Valid Authentication mode values are: <see cref="SmtpAuthentication.None"/>, + /// <see cref="SmtpAuthentication.Basic"/>, and <see cref="SmtpAuthentication.Ntlm"/>. + /// The default value is <see cref="SmtpAuthentication.None"/>. When using + /// <see cref="SmtpAuthentication.Basic"/> you must specify the <see cref="Username"/> /// and <see cref="Password"/> to use to authenticate. /// When using <see cref="SmtpAuthentication.Ntlm"/> the Windows credentials for the current - /// thread, if impersonating, or the process will be used to authenticate. + /// thread, if impersonating, or the process will be used to authenticate. /// </para> /// </remarks> public SmtpAuthentication Authentication @@ -257,9 +257,9 @@ namespace log4net.Appender /// <remarks> /// <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note> /// <para> - /// A <see cref="Username"/> and <see cref="Password"/> must be specified when - /// <see cref="Authentication"/> is set to <see cref="SmtpAuthentication.Basic"/>, - /// otherwise the username will be ignored. + /// A <see cref="Username"/> and <see cref="Password"/> must be specified when + /// <see cref="Authentication"/> is set to <see cref="SmtpAuthentication.Basic"/>, + /// otherwise the username will be ignored. /// </para> /// </remarks> public string Username @@ -274,9 +274,9 @@ namespace log4net.Appender /// <remarks> /// <note type="caution">Authentication is only available on the MS .NET 1.1 runtime.</note> /// <para> - /// A <see cref="Username"/> and <see cref="Password"/> must be specified when - /// <see cref="Authentication"/> is set to <see cref="SmtpAuthentication.Basic"/>, - /// otherwise the password will be ignored. + /// A <see cref="Username"/> and <see cref="Password"/> must be specified when + /// <see cref="Authentication"/> is set to <see cref="SmtpAuthentication.Basic"/>, + /// otherwise the password will be ignored. /// </para> /// </remarks> public string Password @@ -382,12 +382,12 @@ namespace log4net.Appender /// Sends the contents of the cyclic buffer as an e-mail message. /// </summary> /// <param name="events">The logging events to send.</param> - override protected void SendBuffer(LoggingEvent[] events) + override protected void SendBuffer(LoggingEvent[] events) { // Note: this code already owns the monitor for this // appender. This frees us from needing to synchronize again. - try - { + try + { StringWriter writer = new StringWriter(System.Globalization.CultureInfo.InvariantCulture); string t = Layout.Header; @@ -396,7 +396,7 @@ namespace log4net.Appender writer.Write(t); } - for(int i = 0; i < events.Length; i++) + for(int i = 0; i < events.Length; i++) { // Render the event and append the text to the buffer RenderLoggingEvent(writer, events[i]); @@ -409,8 +409,8 @@ namespace log4net.Appender } SendEmail(writer.ToString()); - } - catch(Exception e) + } + catch(Exception e) { ErrorHandler.Error("Error occurred while sending e-mail notification.", e); } @@ -530,7 +530,7 @@ namespace log4net.Appender // the CDO properties. For details of the fields available in CDO see: // // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cdosys/html/_cdosys_configuration_coclass.asp - // + // try { @@ -548,7 +548,7 @@ namespace log4net.Appender } // Set the port if not the default value - if (m_port != 25) + if (m_port != 25) { mailMessage.Fields.Add("http://schemas.microsoft.com/cdo/configuration/smtpserverport", m_port); } @@ -648,7 +648,7 @@ namespace log4net.Appender #endregion // SmtpAuthentication Enum private static readonly char[] ADDRESS_DELIMITERS = new char[] { ',', ';' }; - + /// <summary> /// trims leading and trailing commas or semicolons /// </summary> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/SmtpPickupDirAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/SmtpPickupDirAppender.cs b/src/Appender/SmtpPickupDirAppender.cs index 6d8efa6..c508836 100644 --- a/src/Appender/SmtpPickupDirAppender.cs +++ b/src/Appender/SmtpPickupDirAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -28,7 +28,7 @@ using log4net.Util; namespace log4net.Appender { /// <summary> - /// Send an email when a specific logging event occurs, typically on errors + /// Send an email when a specific logging event occurs, typically on errors /// or fatal errors. Rather than sending via smtp it writes a file into the /// directory specified by <see cref="PickupDir"/>. This allows services such /// as the IIS SMTP agent to manage sending the messages. @@ -43,8 +43,8 @@ namespace log4net.Appender /// The number of logging events delivered in this e-mail depend on /// the value of <see cref="BufferingAppenderSkeleton.BufferSize"/> option. The /// <see cref="SmtpPickupDirAppender"/> keeps only the last - /// <see cref="BufferingAppenderSkeleton.BufferSize"/> logging events in its - /// cyclic buffer. This keeps memory requirements at a reasonable level while + /// <see cref="BufferingAppenderSkeleton.BufferSize"/> logging events in its + /// cyclic buffer. This keeps memory requirements at a reasonable level while /// still delivering useful application context. /// </para> /// </remarks> @@ -82,7 +82,7 @@ namespace log4net.Appender /// A semicolon-delimited list of e-mail addresses. /// </para> /// </remarks> - public string To + public string To { get { return m_to; } set { m_to = value; } @@ -99,7 +99,7 @@ namespace log4net.Appender /// The e-mail address of the sender. /// </para> /// </remarks> - public string From + public string From { get { return m_from; } set { m_from = value; } @@ -116,12 +116,12 @@ namespace log4net.Appender /// The subject line of the e-mail message. /// </para> /// </remarks> - public string Subject + public string Subject { get { return m_subject; } set { m_subject = value; } } - + /// <summary> /// Gets or sets the path to write the messages to. /// </summary> @@ -184,7 +184,7 @@ namespace log4net.Appender /// of the current thread. /// </para> /// </remarks> - public SecurityContext SecurityContext + public SecurityContext SecurityContext { get { return m_securityContext; } set { m_securityContext = value; } @@ -203,11 +203,11 @@ namespace log4net.Appender /// Sends the contents of the cyclic buffer as an e-mail message. /// </para> /// </remarks> - override protected void SendBuffer(LoggingEvent[] events) + override protected void SendBuffer(LoggingEvent[] events) { // Note: this code already owns the monitor for this // appender. This frees us from needing to synchronize again. - try + try { string filePath = null; StreamWriter writer = null; @@ -239,7 +239,7 @@ namespace log4net.Appender writer.Write(t); } - for(int i = 0; i < events.Length; i++) + for(int i = 0; i < events.Length; i++) { // Render the event and append the text to the buffer RenderLoggingEvent(writer, events[i]); @@ -255,8 +255,8 @@ namespace log4net.Appender writer.WriteLine("."); } } - } - catch(Exception e) + } + catch(Exception e) { ErrorHandler.Error("Error occurred while sending e-mail notification.", e); } @@ -267,23 +267,23 @@ namespace log4net.Appender #region Override implementation of AppenderSkeleton /// <summary> - /// Activate the options on this appender. + /// Activate the options on this appender. /// </summary> /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> - override public void ActivateOptions() - { + override public void ActivateOptions() + { base.ActivateOptions(); if (m_securityContext == null) @@ -324,7 +324,7 @@ namespace log4net.Appender /// <para> /// Converts the path specified to a fully /// qualified path. If the path is relative it is - /// taken as relative from the application base + /// taken as relative from the application base /// directory. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Appender/TelnetAppender.cs ---------------------------------------------------------------------- diff --git a/src/Appender/TelnetAppender.cs b/src/Appender/TelnetAppender.cs index 4d768a2..4c8a301 100644 --- a/src/Appender/TelnetAppender.cs +++ b/src/Appender/TelnetAppender.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -32,16 +32,16 @@ using log4net.Layout; using log4net.Core; using log4net.Util; -namespace log4net.Appender +namespace log4net.Appender { /// <summary> /// Appender that allows clients to connect via Telnet to receive log messages /// </summary> - /// <remarks> + /// <remarks> /// <para> /// The TelnetAppender accepts socket connections and streams logging messages - /// back to the client. - /// The output is provided in a telnet-friendly way so that a log can be monitored + /// back to the client. + /// The output is provided in a telnet-friendly way so that a log can be monitored /// over a TCP/IP socket. /// This allows simple remote monitoring of application logging. /// </para> @@ -51,7 +51,7 @@ namespace log4net.Appender /// </remarks> /// <author>Keith Long</author> /// <author>Nicko Cadell</author> - public class TelnetAppender : AppenderSkeleton + public class TelnetAppender : AppenderSkeleton { private SocketHandler m_handler; private int m_listeningPort = 23; @@ -89,7 +89,7 @@ namespace log4net.Appender /// Gets or sets the TCP port number on which this <see cref="TelnetAppender"/> will listen for connections. /// </summary> /// <value> - /// An integer value in the range <see cref="IPEndPoint.MinPort" /> to <see cref="IPEndPoint.MaxPort" /> + /// An integer value in the range <see cref="IPEndPoint.MinPort" /> to <see cref="IPEndPoint.MaxPort" /> /// indicating the TCP port number on which this <see cref="TelnetAppender"/> will listen for connections. /// </value> /// <remarks> @@ -97,7 +97,7 @@ namespace log4net.Appender /// The default value is 23 (the telnet port). /// </para> /// </remarks> - /// <exception cref="ArgumentOutOfRangeException">The value specified is less than <see cref="IPEndPoint.MinPort" /> + /// <exception cref="ArgumentOutOfRangeException">The value specified is less than <see cref="IPEndPoint.MinPort" /> /// or greater than <see cref="IPEndPoint.MaxPort" />.</exception> public int Port { @@ -110,9 +110,9 @@ namespace log4net.Appender if (value < IPEndPoint.MinPort || value > IPEndPoint.MaxPort) { throw log4net.Util.SystemInfo.CreateArgumentOutOfRangeException("value", (object)value, - "The value specified for Port is less than " + - IPEndPoint.MinPort.ToString(NumberFormatInfo.InvariantInfo) + - " or greater than " + + "The value specified for Port is less than " + IPEndPoint.MinPort.ToString(NumberFormatInfo.InvariantInfo) + " or greater than " IPEndPoint.MaxPort.ToString(NumberFormatInfo.InvariantInfo) + "."); } else @@ -132,7 +132,7 @@ namespace log4net.Appender /// Closes all the outstanding connections. /// </para> /// </remarks> - protected override void OnClose() + protected override void OnClose() { base.OnClose(); @@ -163,28 +163,28 @@ namespace log4net.Appender /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// <para> /// Create the socket handler and wait for connections /// </para> /// </remarks> - public override void ActivateOptions() + public override void ActivateOptions() { base.ActivateOptions(); - try + try { LogLog.Debug(declaringType, "Creating SocketHandler to listen on port ["+m_listeningPort+"]"); m_handler = new SocketHandler(m_listeningPort); } - catch(Exception ex) + catch(Exception ex) { LogLog.Error(declaringType, "Failed to create SocketHandler", ex); throw; @@ -200,7 +200,7 @@ namespace log4net.Appender /// Writes the logging event to each connected client. /// </para> /// </remarks> - protected override void Append(LoggingEvent loggingEvent) + protected override void Append(LoggingEvent loggingEvent) { if (m_handler != null && m_handler.HasConnections) { @@ -223,7 +223,7 @@ namespace log4net.Appender /// </para> /// </remarks> protected class SocketHandler : IDisposable - { + { private const int MAX_CONNECTIONS = 20; private Socket m_serverSocket; @@ -323,7 +323,7 @@ namespace log4net.Appender #endregion } - + /// <summary> /// Opens a new server port on <paramref ref="port"/> /// </summary> @@ -416,7 +416,7 @@ namespace log4net.Appender /// <remarks> /// <para> /// This property will be <c>true</c> while this handler has - /// active connections, that is at least one connection that + /// active connections, that is at least one connection that /// the handler will attempt to send a message to. /// </para> /// </remarks> @@ -429,7 +429,7 @@ namespace log4net.Appender return (localClients != null && localClients.Count > 0); } } - + #if NETSTANDARD1_3 private void OnConnect(Task<Socket> acceptTask) @@ -440,7 +440,7 @@ namespace log4net.Appender /// <param name="asyncResult">The result of the asynchronous operation</param> /// <remarks> /// <para> - /// On connection adds to the list of connections + /// On connection adds to the list of connections /// if there are two many open connections you will be disconnected /// </para> /// </remarks> @@ -459,7 +459,7 @@ namespace log4net.Appender SocketClient client = new SocketClient(socket); int currentActiveConnectionsCount = m_clients.Count; - if (currentActiveConnectionsCount < MAX_CONNECTIONS) + if (currentActiveConnectionsCount < MAX_CONNECTIONS) { try { @@ -471,7 +471,7 @@ namespace log4net.Appender client.Dispose(); } } - else + else { client.Send("Sorry - Too many connections.\r\n"); client.Dispose(); @@ -511,21 +511,21 @@ namespace log4net.Appender Socket localSocket = m_serverSocket; m_serverSocket = null; - try + try { localSocket.Shutdown(SocketShutdown.Both); - } - catch - { + } + catch + { } try { localSocket.Close(); } - catch - { - } + catch + { + } } #endregion