Skip to content

Commit

Permalink
fix regression from 3.0.0 (log4j:data instead of log4j:throwable)
Browse files Browse the repository at this point in the history
fixes #225
  • Loading branch information
FreeAndNil committed Feb 4, 2025
1 parent 1a6ff0f commit df3b801
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 1 deletion.
67 changes: 67 additions & 0 deletions src/log4net.Tests/Layout/XmlLayoutSchemaLog4jTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#region Apache 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.
//
#endregion

using System;

using log4net.Config;
using log4net.Layout;
using log4net.Repository;
using log4net.Tests.Appender;

using NUnit.Framework;

namespace log4net.Tests.Layout
{
/// <summary>
/// Tests for <see cref="XmlLayoutSchemaLog4J"/>
/// </summary>
[TestFixture]
public class XmlLayoutSchemaLog4JTest
{
/// <summary>
/// Tests a regression from 3.0.0 (log4j:data instead of log4j:throwable)
/// </summary>
[Test]
public void LogExceptionTest()
{
StringAppender stringAppender = new() { Layout = new XmlLayoutSchemaLog4J() };

ILoggerRepository repository = LogManager.CreateRepository(Guid.NewGuid().ToString());
BasicConfigurator.Configure(repository, stringAppender);
ILog log = LogManager.GetLogger(repository.Name, "TestLogger");

ThrowAndLog(42);

string logEventXml = stringAppender.GetString();
Assert.That(logEventXml, Does.Contain("log4j:throwable"));

void ThrowAndLog(int foo)
{
try
{
throw new TimeoutException();
}
catch (TimeoutException ex)
{
log.Error($"Error {foo}", ex);
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/log4net/Layout/XmlLayoutSchemaLog4j.cs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent)
if (!string.IsNullOrEmpty(exceptionStr))
{
// Append the stack trace line
writer.WriteStartElement("log4j:throwable", "log4j", "data", "log4net");
writer.WriteStartElement("log4j:throwable", "log4j", "throwable", "log4net");
Transform.WriteEscapedXmlString(writer, exceptionStr!, InvalidCharReplacement);
writer.WriteEndElement();
}
Expand Down

0 comments on commit df3b801

Please sign in to comment.