-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prefix stack traces with a newline in Pattern Layout (#3073)
- Exception converters are reworked to ensure a newline prefix (which used to be a whitespace) - Fix property extraction for root exceptions (e.g., %rEx{short.className}) - Ports #3045 Co-authored-by: AlanYu <alan0428a@gmail.com> Co-authored-by: Piotr P. Karwasz <piotr@github.copernik.eu>
- Loading branch information
1 parent
cd5f01e
commit 0784be4
Showing
32 changed files
with
899 additions
and
789 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 0 additions & 68 deletions
68
log4j-core-test/src/main/java/org/apache/logging/log4j/core/GarbageCollectionHelper.java
This file was deleted.
Oops, something went wrong.
54 changes: 54 additions & 0 deletions
54
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/internal/GcHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* 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.test.internal; | ||
|
||
import java.lang.ref.PhantomReference; | ||
import java.lang.ref.Reference; | ||
import java.lang.ref.ReferenceQueue; | ||
import org.junit.jupiter.api.function.ThrowingSupplier; | ||
|
||
public final class GcHelper { | ||
|
||
private GcHelper() {} | ||
|
||
/** | ||
* Waits for the value to be garbage collected. | ||
* | ||
* @param valueSupplier a value provider | ||
*/ | ||
@SuppressWarnings({"unused", "UnusedAssignment"}) | ||
public static void awaitGarbageCollection(final ThrowingSupplier<?> valueSupplier) throws InterruptedException { | ||
|
||
// Create the reference queue | ||
final ReferenceQueue<Object> refQueue = new ReferenceQueue<>(); | ||
final Reference<?> ref; | ||
try { | ||
final Object value = valueSupplier.get(); | ||
ref = new PhantomReference<>(value, refQueue); | ||
} catch (final Throwable error) { | ||
throw new RuntimeException("failed obtaining value", error); | ||
} | ||
|
||
// Wait for the garbage collection | ||
try (final GcPressureGenerator ignored = GcPressureGenerator.ofStarted()) { | ||
final Reference<?> removedRef = refQueue.remove(30_000L); | ||
if (removedRef == null) { | ||
throw new AssertionError("garbage collector did not reclaim the value"); | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.