This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 0e56d1a567 ARTEMIS-3961 don't log OperationContext
new fcd9ff2a86 This closes #4193
0e56d1a567 is described below
commit 0e56d1a567a99ecba7ae3836c81a807309132cd8
Author: Justin Bertram <[email protected]>
AuthorDate: Mon Aug 29 12:09:49 2022 -0500
ARTEMIS-3961 don't log OperationContext
---
.../core/persistence/impl/journal/OperationContextImpl.java | 10 +---------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 +-
.../core/server/plugin/impl/LoggingActiveMQServerPlugin.java | 2 +-
.../server/plugin/impl/LoggingActiveMQServerPluginLogger.java | 6 ++----
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
index aca5350e50..91681ff078 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextImpl.java
@@ -386,13 +386,6 @@ public class OperationContextImpl implements
OperationContext {
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
- if (tasks != null) {
- for (TaskHolder hold : tasks) {
- buffer.append("Task = " + hold + "\n");
- }
- }
-
return "OperationContextImpl [" + hashCode() + "] [minimalStore=" +
minimalStore +
", storeLineUp=" +
storeLineUpField +
@@ -416,7 +409,6 @@ public class OperationContextImpl implements
OperationContext {
errorMessage +
", executorsPending=" +
executorsPendingField +
- ", executor=" + this.executor +
- "]" + buffer.toString();
+ "]";
}
}
\ No newline at end of file
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 3b0bf25125..2b9a32aff5 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -1722,7 +1722,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
{
if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.createCoreSession(this, connection.getSubject(),
connection.getRemoteAddress(), name, username, "****", minLargeMessageSize,
connection, autoCommitSends,
- autoCommitAcks, preAcknowledge, xa,
defaultAddress, callback, autoCreateQueues, context, prefixes);
+ autoCommitAcks, preAcknowledge, xa,
defaultAddress, callback, autoCreateQueues, prefixes);
}
final ServerSessionImpl session = internalCreateSession(name, username,
password, validatedUser, minLargeMessageSize, connection, autoCommitSends,
autoCommitAcks, preAcknowledge, xa, defaultAddress, callback, context,
autoCreateQueues, prefixes, securityDomain);
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
index 94dbe6ce8a..2f939f530b 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
@@ -189,7 +189,7 @@ public class LoggingActiveMQServerPlugin implements
ActiveMQServerPlugin, Serial
if (logAll || logSessionEvents) {
LoggingActiveMQServerPluginLogger.LOGGER.beforeCreateSession(name,
username, minLargeMessageSize, connection,
autoCommitSends, autoCommitAcks, preAcknowledge,
- xa,
publicAddress, context);
+ xa,
publicAddress);
}
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPluginLogger.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPluginLogger.java
index 38ada8ed2e..27b7e8ff41 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPluginLogger.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPluginLogger.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.core.server.plugin.impl;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
-import org.apache.activemq.artemis.core.persistence.OperationContext;
import org.apache.activemq.artemis.core.postoffice.QueueBinding;
import org.apache.activemq.artemis.core.postoffice.RoutingStatus;
import org.apache.activemq.artemis.core.security.SecurityAuth;
@@ -153,7 +152,7 @@ public interface LoggingActiveMQServerPluginLogger extends
BasicLogger {
@LogMessage(level = Logger.Level.DEBUG)
@Message(id = 843000, value = "beforeCreateSession called with name: {0},
username: {1}, minLargeMessageSize: {2}, connection: {3},"
- + " autoCommitSends: {4}, autoCommitAcks: {5}, preAcknowledge: {6}, xa:
{7}, publicAddress: {8}, context: {9}",
+ + " autoCommitSends: {4}, autoCommitAcks: {5}, preAcknowledge: {6}, xa:
{7}, publicAddress: {8}",
format = Message.Format.MESSAGE_FORMAT)
void beforeCreateSession(String name,
String username,
@@ -163,8 +162,7 @@ public interface LoggingActiveMQServerPluginLogger extends
BasicLogger {
boolean autoCommitAcks,
boolean preAcknowledge,
boolean xa,
- String publicAddress,
- OperationContext context);
+ String publicAddress);
@LogMessage(level = Logger.Level.DEBUG)
@Message(id = 843001, value = "beforeCloseSession called with session name
: {0}, session: {1}, failed: {2}", format = Message.Format.MESSAGE_FORMAT)
