Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #1330

This commit is contained in:
Justin Bertram 2017-06-12 12:37:40 -05:00
parent 67efdc34ae d3010682a4
commit 90edd572f0
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
View File

@ -77,6 +77,10 @@ public interface ActiveMQRALogger extends BasicLogger {
@Message(id = 151006, value = "Cluster topology change detected. Re-balancing connections on even {0}.", format = Message.Format.MESSAGE_FORMAT) @Message(id = 151006, value = "Cluster topology change detected. Re-balancing connections on even {0}.", format = Message.Format.MESSAGE_FORMAT)
void rebalancingConnections(String event); void rebalancingConnections(String event);
@LogMessage(level = Logger.Level.INFO)
@Message(id = 151007, value = "Resource adaptor started", format = Message.Format.MESSAGE_FORMAT)
void resourceAdaptorStarted();
@LogMessage(level = Logger.Level.WARN) @LogMessage(level = Logger.Level.WARN)
@Message(id = 152001, value = "problem resetting xa session after failure", format = Message.Format.MESSAGE_FORMAT) @Message(id = 152001, value = "problem resetting xa session after failure", format = Message.Format.MESSAGE_FORMAT)
void problemResettingXASession(@Cause Throwable t); void problemResettingXASession(@Cause Throwable t);
@ -113,6 +117,14 @@ public interface ActiveMQRALogger extends BasicLogger {
@Message(id = 152009, value = "Unable to validate properties", format = Message.Format.MESSAGE_FORMAT) @Message(id = 152009, value = "Unable to validate properties", format = Message.Format.MESSAGE_FORMAT)
void unableToValidateProperties(@Cause Exception e); void unableToValidateProperties(@Cause Exception e);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 152010, value = "Unable to clear the transaction", format = Message.Format.MESSAGE_FORMAT)
void unableToClearTheTransaction(@Cause Exception e);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 152011, value = "Unable to close the factory", format = Message.Format.MESSAGE_FORMAT)
void unableToCloseFactory(@Cause Throwable e);
@LogMessage(level = Logger.Level.ERROR) @LogMessage(level = Logger.Level.ERROR)
@Message(id = 154000, value = "Error while creating object Reference.", format = Message.Format.MESSAGE_FORMAT) @Message(id = 154000, value = "Error while creating object Reference.", format = Message.Format.MESSAGE_FORMAT)
void errorCreatingReference(@Cause Exception e); void errorCreatingReference(@Cause Exception e);

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
View File

@ -251,7 +251,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable {
} }
} }
ActiveMQRALogger.LOGGER.info("Resource adaptor started"); ActiveMQRALogger.LOGGER.resourceAdaptorStarted();
} }
/** /**

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivation.java
View File

@ -421,7 +421,7 @@ public class ActiveMQActivation {
// closing the factory will help making sure pending threads are closed // closing the factory will help making sure pending threads are closed
factory.close(); factory.close();
} catch (Throwable e) { } catch (Throwable e) {
ActiveMQRALogger.LOGGER.warn(e); ActiveMQRALogger.LOGGER.unableToCloseFactory(e);
} }
factory = null; factory = null;

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQMessageHandler.java
View File

@ -342,7 +342,7 @@ public class ActiveMQMessageHandler implements MessageHandler, FailoverEventList
tx.setRollbackOnly(); tx.setRollbackOnly();
} }
} catch (Exception e1) { } catch (Exception e1) {
ActiveMQRALogger.LOGGER.warn("unable to clear the transaction", e1); ActiveMQRALogger.LOGGER.unableToClearTheTransaction(e1);
} }
} }