Skip to content

Commit

Permalink
upgrade log4net to 2.0.14. (#5191)
Browse files Browse the repository at this point in the history 
* upgrade log4net to 2.0.14.

* Update DNN Platform/DotNetNuke.Log4net/log4net/AssemblyInfo.cs

Good idea

Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>

Co-authored-by: Peter Donker <peter@bring2mind.net>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
  • Loading branch information
@zyhfish @donker @bdukes
3 people authored Jul 19, 2022
1 parent 61bacf0 commit 327b1f5
Show file tree
Hide file tree
Showing 226 changed files with 55,286 additions and 55,627 deletions.
2,150 changes: 1,088 additions & 1,062 deletions DNN Platform/DotNetNuke.Log4net/log4net/Appender/AdoNetAppender.cs
View file

Large diffs are not rendered by default.

1,066 changes: 529 additions & 537 deletions DNN Platform/DotNetNuke.Log4net/log4net/Appender/AnsiColorTerminalAppender.cs
View file

Large diffs are not rendered by default.

1,581 changes: 785 additions & 796 deletions DNN Platform/DotNetNuke.Log4net/log4net/Appender/AppenderCollection.cs
View file

Large diffs are not rendered by default.

1,667 changes: 833 additions & 834 deletions DNN Platform/DotNetNuke.Log4net/log4net/Appender/AppenderSkeleton.cs
View file

Large diffs are not rendered by default.

256 changes: 128 additions & 128 deletions DNN Platform/DotNetNuke.Log4net/log4net/Appender/AspNetTraceAppender.cs
View file
Original file line number Diff line number Diff line change
@@ -1,141 +1,141 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information
//
// 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.
// 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 obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

//
// 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.
// 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 obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

// .NET Compact Framework 1.0 has no support for ASP.NET
// SSCLI 1.0 has no support for ASP.NET
#if !NETCF && !SSCLI && !CLIENT_PROFILE

using System.Web;
#if NET_2_0
// SSCLI 1.0 has no support for ASP.NET
#if !NETCF && !SSCLI && !CLIENT_PROFILE

using log4net.Core;
using log4net.Layout;

namespace log4net.Appender
{
/// <summary>
/// <para>
/// Appends log events to the ASP.NET <see cref="TraceContext"/> system.
/// </para>
/// </summary>
/// <remarks>
/// <para>
/// Diagnostic information and tracing messages that you specify are appended to the output
/// of the page that is sent to the requesting browser. Optionally, you can view this information
/// from a separate trace viewer (Trace.axd) that displays trace information for every page in a
/// given application.
/// </para>
/// <para>
/// Trace statements are processed and displayed only when tracing is enabled. You can control
/// whether tracing is displayed to a page, to the trace viewer, or both.
/// </para>
/// <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.
/// </para>
/// </remarks>
/// <author>Nicko Cadell.</author>
/// <author>Gert Driesen.</author>
/// <author>Ron Grabowski.</author>
public class AspNetTraceAppender : AppenderSkeleton
using System.Web;

using log4net.Layout;
using log4net.Core;

namespace log4net.Appender
{
/// <summary>
/// <para>
/// Appends log events to the ASP.NET <see cref="TraceContext"/> system.
/// </para>
/// </summary>
/// <remarks>
/// <para>
/// Diagnostic information and tracing messages that you specify are appended to the output
/// of the page that is sent to the requesting browser. Optionally, you can view this information
/// from a separate trace viewer (Trace.axd) that displays trace information for every page in a
/// given application.
/// </para>
/// <para>
/// Trace statements are processed and displayed only when tracing is enabled. You can control
/// whether tracing is displayed to a page, to the trace viewer, or both.
/// </para>
/// <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.
/// </para>
/// </remarks>
/// <author>Nicko Cadell</author>
/// <author>Gert Driesen</author>
/// <author>Ron Grabowski</author>
public class AspNetTraceAppender : AppenderSkeleton
{
/// <summary>
/// Initializes a new instance of the <see cref="AspNetTraceAppender" /> class.
/// </summary>
/// <remarks>
/// <para>
/// Default constructor.
/// </para>
/// </remarks>
public AspNetTraceAppender()
{
/// <summary>
/// Initializes a new instance of the <see cref="AspNetTraceAppender" /> class.
/// </summary>
/// <remarks>
/// <para>
/// Default constructor.
/// </para>
/// </remarks>
public AspNetTraceAppender()
{
}

/// <summary>
/// Write the logging event to the ASP.NET trace.
/// </summary>
/// <param name="loggingEvent">the event to log.</param>
/// <remarks>
/// <para>
/// Write the logging event to the ASP.NET trace
/// <c>HttpContext.Current.Trace</c>
/// (<see cref="TraceContext"/>).
/// </para>
/// </remarks>
protected override void Append(LoggingEvent loggingEvent)
{
// check if log4net is running in the context of an ASP.NET application
if (HttpContext.Current != null)
{
// check if tracing is enabled for the current context
if (HttpContext.Current.Trace.IsEnabled)
{
if (loggingEvent.Level >= Level.Warn)
{
HttpContext.Current.Trace.Warn(this.m_category.Format(loggingEvent), this.RenderLoggingEvent(loggingEvent));
}
else
{
HttpContext.Current.Trace.Write(this.m_category.Format(loggingEvent), this.RenderLoggingEvent(loggingEvent));
}
}
}
}

/// <summary>
/// Gets a value indicating whether this appender requires a <see cref="Layout"/> to be set.
/// </summary>
/// <value><c>true</c>.</value>
/// <remarks>
/// <para>
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
protected override bool RequiresLayout
{
get { return true; }
/// <summary>
/// Write the logging event to the ASP.NET trace
/// </summary>
/// <param name="loggingEvent">the event to log</param>
/// <remarks>
/// <para>
/// Write the logging event to the ASP.NET trace
/// <c>HttpContext.Current.Trace</c>
/// (<see cref="TraceContext"/>).
/// </para>
/// </remarks>
protected override void Append(LoggingEvent loggingEvent)
{
// check if log4net is running in the context of an ASP.NET application
if (HttpContext.Current != null)
{
// check if tracing is enabled for the current context
if (HttpContext.Current.Trace.IsEnabled)
{
if (loggingEvent.Level >= Level.Warn)
{
HttpContext.Current.Trace.Warn(this.m_category.Format(loggingEvent), this.RenderLoggingEvent(loggingEvent));
}
else
{
HttpContext.Current.Trace.Write(this.m_category.Format(loggingEvent), this.RenderLoggingEvent(loggingEvent));
}
}
}
}

/// <summary>
/// Gets or sets 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 this.m_category; }
set { this.m_category = value; }
/// <summary>
/// This appender requires a <see cref="Layout"/> to be set.
/// </summary>
/// <value><c>true</c></value>
/// <remarks>
/// <para>
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
protected override bool RequiresLayout
{
get { return true; }
}

/// <summary>
/// Defaults to %logger.
/// </summary>
/// <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 this.m_category; }
set { this.m_category = value; }
}

/// <summary>
/// Defaults to %logger
/// </summary>
private PatternLayout m_category = new PatternLayout("%logger");
}
}

#endif // !NETCF && !SSCLI
}
}

#endif // !NETCF && !SSCLI
#endif // NET_2_0
Loading

0 comments on commit 327b1f5

Please sign in to comment.