garydgregory commented on a change in pull request #786:
URL: https://github.com/apache/logging-log4j2/pull/786#discussion_r820738169
##########
File path:
log4j-1.2-api/src/main/java/org/apache/log4j/bridge/FilterWrapper.java
##########
@@ -27,6 +27,16 @@
private final org.apache.logging.log4j.core.Filter filter;
+ public static Filter wrap(org.apache.logging.log4j.core.Filter filter) {
+ if (filter instanceof FilterAdapter) {
Review comment:
Test if the input is already a FilterWrapper and return it?
##########
File path:
log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderWrapper.java
##########
@@ -34,6 +35,19 @@
private static final Logger LOGGER = StatusLogger.getLogger();
private final org.apache.logging.log4j.core.Appender appender;
+ public static Appender wrap(org.apache.logging.log4j.core.Appender
appender) {
+ if (appender instanceof Adapter) {
Review comment:
Might as well also test and return the input if it is already an
AppenderWrapper. Also, since we does not always "wrap", we might want to keep
using "adapt" as the verb.
##########
File path:
log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SyslogAppenderBuilder.java
##########
@@ -127,20 +127,15 @@ private Appender createAppender(final String name, final
Log4j1Configuration con
final AtomicReference<String> host = new AtomicReference<>();
final AtomicInteger port = new AtomicInteger();
resolveSyslogHost(syslogHost, host, port);
- org.apache.logging.log4j.core.Layout<? extends Serializable>
appenderLayout;
- if (layout instanceof LayoutWrapper) {
- appenderLayout = ((LayoutWrapper) layout).getLayout();
- } else if (layout != null) {
- appenderLayout = new LayoutAdapter(layout);
- } else {
+ org.apache.logging.log4j.core.Layout<? extends Serializable>
appenderLayout = LayoutAdapter.adapt(layout);
+ if (appenderLayout == null) {
appenderLayout = SyslogLayout.newBuilder()
.setFacility(Facility.toFacility(facility))
- .setConfiguration(configuration)
- .build();
+ .setConfiguration(configuration).build();
Review comment:
I like the existing formatting better.
##########
File path:
log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
##########
@@ -29,10 +29,23 @@
public class LayoutAdapter implements
org.apache.logging.log4j.core.Layout<String> {
private Layout layout;
- public LayoutAdapter(Layout layout) {
+ public static org.apache.logging.log4j.core.Layout<?> adapt(Layout layout)
{
+ if (layout instanceof LayoutWrapper) {
Review comment:
Test if input is already a LayoutAdapter and return it?
##########
File path:
log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutWrapper.java
##########
@@ -26,6 +26,16 @@
private final org.apache.logging.log4j.core.Layout<?> layout;
+ public static Layout wrap(org.apache.logging.log4j.core.Layout<?> layout) {
+ if (layout instanceof LayoutAdapter) {
Review comment:
Test if input is already a LayoutWrapper and return it?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
