-
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.
[1524] Add Jakarta version of JMS appender
This adds a Jakarta version of the JMS appender as a new `log4j-jakarta-jms` module. Closes #1524.
- Loading branch information
Showing
8 changed files
with
1,117 additions
and
0 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
~ 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. | ||
--> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>org.apache.logging.log4j</groupId> | ||
<artifactId>log4j</artifactId> | ||
<version>3.0.0-SNAPSHOT</version> | ||
</parent> | ||
|
||
<artifactId>log4j-jakarta-jms</artifactId> | ||
<name>Apache Log4j Jakarta JMS</name> | ||
<description>Apache Log4j Java Message Service (JMS), version for Jakarta EE 9.</description> | ||
<properties> | ||
<log4jParentDir>${basedir}/..</log4jParentDir> | ||
<docLabel>Log4j JMS Documentation</docLabel> | ||
<projectDir>/log4j-jakarta-jms</projectDir> | ||
<module.name>org.apache.logging.log4j.jms</module.name> | ||
</properties> | ||
|
||
<dependencies> | ||
<!-- Used for JMS appenders (needs an implementation of course) --> | ||
<dependency> | ||
<groupId>jakarta.jms</groupId> | ||
<artifactId>jakarta.jms-api</artifactId> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.logging.log4j</groupId> | ||
<artifactId>log4j-core</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.logging.log4j</groupId> | ||
<artifactId>log4j-jndi</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.logging.log4j</groupId> | ||
<artifactId>log4j-api-test</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.logging.log4j</groupId> | ||
<artifactId>log4j-core-test</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.logging.log4j</groupId> | ||
<artifactId>log4j-jndi-test</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>commons-logging</groupId> | ||
<artifactId>commons-logging</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.hamcrest</groupId> | ||
<artifactId>hamcrest</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.junit.jupiter</groupId> | ||
<artifactId>junit-jupiter-engine</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.junit.vintage</groupId> | ||
<artifactId>junit-vintage-engine</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<!-- Mocking framework for use with JUnit --> | ||
<dependency> | ||
<groupId>org.mockito</groupId> | ||
<artifactId>mockito-core</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<!-- Useful mock classes and utilities --> | ||
<dependency> | ||
<groupId>org.springframework</groupId> | ||
<artifactId>spring-test</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.felix</groupId> | ||
<artifactId>maven-bundle-plugin</artifactId> | ||
<configuration> | ||
<instructions> | ||
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> | ||
<Export-Package>*</Export-Package> | ||
</instructions> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
241 changes: 241 additions & 0 deletions
241
log4j-jakarta-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsAppender.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,241 @@ | ||
/* | ||
* 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.jms.appender; | ||
|
||
import java.util.Properties; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
import jakarta.jms.JMSException; | ||
|
||
import org.apache.logging.log4j.core.Appender; | ||
import org.apache.logging.log4j.core.Filter; | ||
import org.apache.logging.log4j.core.Layout; | ||
import org.apache.logging.log4j.core.LogEvent; | ||
import org.apache.logging.log4j.core.appender.AbstractAppender; | ||
import org.apache.logging.log4j.core.appender.AbstractManager; | ||
import org.apache.logging.log4j.core.config.Property; | ||
import org.apache.logging.log4j.core.util.Constants; | ||
import org.apache.logging.log4j.jms.appender.JmsManager.JmsManagerConfiguration; | ||
import org.apache.logging.log4j.plugins.Configurable; | ||
import org.apache.logging.log4j.plugins.Plugin; | ||
import org.apache.logging.log4j.plugins.PluginAliases; | ||
import org.apache.logging.log4j.plugins.PluginBuilderAttribute; | ||
import org.apache.logging.log4j.plugins.PluginFactory; | ||
import org.apache.logging.log4j.plugins.validation.constraints.Required; | ||
|
||
/** | ||
* Generic JMS Appender plugin for both queues and topics. This Appender replaces the previous split ones. However, | ||
* configurations set up for the 2.0 version of the JMS appenders will still work. | ||
*/ | ||
@Configurable(elementType = Appender.ELEMENT_TYPE, printObject = true) | ||
@Plugin("JMS") | ||
@PluginAliases({ "JMSQueue", "JMSTopic" }) | ||
public class JmsAppender extends AbstractAppender { | ||
|
||
public static final class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B> | ||
implements org.apache.logging.log4j.plugins.util.Builder<JmsAppender> { | ||
|
||
public static final int DEFAULT_RECONNECT_INTERVAL_MILLIS = 5000; | ||
|
||
@PluginBuilderAttribute | ||
private String factoryName; | ||
|
||
@PluginBuilderAttribute | ||
private String providerUrl; | ||
|
||
@PluginBuilderAttribute | ||
private String urlPkgPrefixes; | ||
|
||
@PluginBuilderAttribute | ||
private String securityPrincipalName; | ||
|
||
@PluginBuilderAttribute(sensitive = true) | ||
private String securityCredentials; | ||
|
||
@PluginBuilderAttribute | ||
@Required(message = "A jakarta.jms.ConnectionFactory JNDI name must be specified") | ||
private String factoryBindingName; | ||
|
||
@PluginBuilderAttribute | ||
@PluginAliases({ "queueBindingName", "topicBindingName" }) | ||
@Required(message = "A jakarta.jms.Destination JNDI name must be specified") | ||
private String destinationBindingName; | ||
|
||
@PluginBuilderAttribute | ||
private String userName; | ||
|
||
@PluginBuilderAttribute(sensitive = true) | ||
private char[] password; | ||
|
||
@PluginBuilderAttribute | ||
private long reconnectIntervalMillis = DEFAULT_RECONNECT_INTERVAL_MILLIS; | ||
|
||
@PluginBuilderAttribute | ||
private boolean immediateFail; | ||
|
||
// Programmatic access only for now. | ||
private JmsManager jmsManager; | ||
|
||
private Builder() { | ||
} | ||
|
||
@SuppressWarnings("resource") // actualJmsManager and jndiManager are managed by the JmsAppender | ||
@Override | ||
public JmsAppender build() { | ||
if (!Constants.JNDI_JMS_ENABLED) { | ||
LOGGER.error("JNDI has not been enabled. The log4j2.enableJndi property must be set to true"); | ||
return null; | ||
} | ||
JmsManager actualJmsManager = jmsManager; | ||
JmsManagerConfiguration configuration = null; | ||
if (actualJmsManager == null) { | ||
final Properties additionalProperties = null; | ||
final Properties jndiProperties = JmsManager.createJndiProperties(factoryName, providerUrl, | ||
urlPkgPrefixes, securityPrincipalName, securityCredentials, additionalProperties); | ||
configuration = new JmsManagerConfiguration(jndiProperties, factoryBindingName, destinationBindingName, | ||
userName, password, false, reconnectIntervalMillis); | ||
actualJmsManager = AbstractManager.getManager(getName(), JmsManager.FACTORY, configuration); | ||
} | ||
if (actualJmsManager == null) { | ||
// JmsManagerFactory has already logged an ERROR. | ||
return null; | ||
} | ||
try { | ||
return new JmsAppender(getName(), getFilter(), getLayout(), isIgnoreExceptions(), getPropertyArray(), actualJmsManager); | ||
} catch (final JMSException e) { | ||
// Never happens since the ctor no longer actually throws a JMSException. | ||
throw new IllegalStateException(e); | ||
} | ||
} | ||
|
||
public B setDestinationBindingName(final String destinationBindingName) { | ||
this.destinationBindingName = destinationBindingName; | ||
return asBuilder(); | ||
} | ||
|
||
public B setFactoryBindingName(final String factoryBindingName) { | ||
this.factoryBindingName = factoryBindingName; | ||
return asBuilder(); | ||
} | ||
|
||
public B setFactoryName(final String factoryName) { | ||
this.factoryName = factoryName; | ||
return asBuilder(); | ||
} | ||
|
||
public B setImmediateFail(final boolean immediateFail) { | ||
this.immediateFail = immediateFail; | ||
return asBuilder(); | ||
} | ||
|
||
public B setJmsManager(final JmsManager jmsManager) { | ||
this.jmsManager = jmsManager; | ||
return asBuilder(); | ||
} | ||
|
||
public B setPassword(final char[] password) { | ||
this.password = password; | ||
return asBuilder(); | ||
} | ||
|
||
public B setProviderUrl(final String providerUrl) { | ||
this.providerUrl = providerUrl; | ||
return asBuilder(); | ||
} | ||
|
||
public B setReconnectIntervalMillis(final long reconnectIntervalMillis) { | ||
this.reconnectIntervalMillis = reconnectIntervalMillis; | ||
return asBuilder(); | ||
} | ||
|
||
public B setSecurityCredentials(final String securityCredentials) { | ||
this.securityCredentials = securityCredentials; | ||
return asBuilder(); | ||
} | ||
|
||
public B setSecurityPrincipalName(final String securityPrincipalName) { | ||
this.securityPrincipalName = securityPrincipalName; | ||
return asBuilder(); | ||
} | ||
|
||
public B setUrlPkgPrefixes(final String urlPkgPrefixes) { | ||
this.urlPkgPrefixes = urlPkgPrefixes; | ||
return asBuilder(); | ||
} | ||
|
||
public B setUserName(final String userName) { | ||
this.userName = userName; | ||
return asBuilder(); | ||
} | ||
|
||
/** | ||
* Does not include the password. | ||
*/ | ||
@Override | ||
public String toString() { | ||
return "Builder [name=" + getName() + ", factoryName=" + factoryName + ", providerUrl=" + providerUrl | ||
+ ", urlPkgPrefixes=" + urlPkgPrefixes + ", securityPrincipalName=" + securityPrincipalName | ||
+ ", securityCredentials=" + securityCredentials + ", factoryBindingName=" + factoryBindingName | ||
+ ", destinationBindingName=" + destinationBindingName + ", username=" + userName + ", layout=" | ||
+ getLayout() + ", filter=" + getFilter() + ", ignoreExceptions=" + isIgnoreExceptions() | ||
+ ", jmsManager=" + jmsManager + "]"; | ||
} | ||
|
||
} | ||
|
||
@PluginFactory | ||
public static Builder newBuilder() { | ||
return new Builder(); | ||
} | ||
|
||
private final JmsManager manager; | ||
|
||
/** | ||
* @param name The Appender's name. | ||
* @param filter The filter to attach to the Appender, if any. | ||
* @param layout The layout to use to render the event. | ||
* @param ignoreExceptions true if exceptions should be ignore, false otherwise. | ||
* @param properties TODO | ||
* @param manager The JMSManager. | ||
* @throws JMSException | ||
* not thrown as of 2.9 but retained in the signature for compatibility, will be removed in 3.0. | ||
*/ | ||
protected JmsAppender(final String name, final Filter filter, final Layout layout, | ||
final boolean ignoreExceptions, final Property[] properties, final JmsManager manager) throws JMSException { | ||
super(name, filter, layout, ignoreExceptions, properties); | ||
this.manager = manager; | ||
} | ||
|
||
@Override | ||
public void append(final LogEvent event) { | ||
this.manager.send(event, getLayout()); | ||
} | ||
|
||
public JmsManager getManager() { | ||
return manager; | ||
} | ||
|
||
@Override | ||
public boolean stop(final long timeout, final TimeUnit timeUnit) { | ||
setStopping(); | ||
boolean stopped = super.stop(timeout, timeUnit, false); | ||
stopped &= this.manager.stop(timeout, timeUnit); | ||
setStopped(); | ||
return stopped; | ||
} | ||
|
||
} |
Oops, something went wrong.