Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* 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.
*/
package org.apache.logging.log4j.core.appender;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;

class DefaultLayoutTest {
@Test
void testDefaultLayout() {
PrintStream standardOutput = System.out;
ByteArrayOutputStream baos = new ByteArrayOutputStream();

System.setOut(new PrintStream(baos));
try {
Logger log = LogManager.getLogger(getClass());
log.fatal("This is a fatal message");
log.error("This is an error message");
log.warn("This is a warning message");

String actualOutput = new String(baos.toByteArray(), Charset.defaultCharset());
assertTrue(actualOutput.contains("FATAL This is a fatal message" + System.lineSeparator()));
assertTrue(actualOutput.contains("ERROR This is an error message" + System.lineSeparator()));
assertFalse(actualOutput.contains("This is a warning message"));
} finally {
System.setOut(standardOutput);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ private DefaultLayout() {}
@Override
public String toSerializable(LogEvent event) {
return new StatusData(
event.getSource(),
event.getLevel(),
event.getMessage(),
event.getThrown(),
event.getThreadName())
.getFormattedStatus();
event.getSource(),
event.getLevel(),
event.getMessage(),
event.getThrown(),
event.getThreadName())
.getFormattedStatus()
+ System.lineSeparator();
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions src/changelog/.2.x.x/3835-default-layout.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns="https://logging.apache.org/xml/ns"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="fixed">
<issue id="3835" link="https://github.com/apache/logging-log4j2/issues/3835"/>
<description format="asciidoc">
Fix missing newlines in default logging configuration for log4j-core.
</description>
</entry>
Loading