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

Revert "[ARTEMIS-1171] Improve log readability around clustering" 

This reverts commit 744221dcb5.

Broke o.a.a.a.t.i.m.QueueControlUsingCoreTest.testListDeliveringMessages
This commit is contained in:
Justin Bertram 2017-05-24 17:50:45 -05:00 committed by Clebert Suconic
parent 4a6dc4f7ba
commit 5a9830af17
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
View File

@ -129,8 +129,8 @@ public final class DiscoveryGroupConfiguration implements Serializable {
public String toString() {
return "DiscoveryGroupConfiguration{" +
"name='" + name + '\'' +
",\n refreshTimeout=" + refreshTimeout +
",\n discoveryInitialWaitTimeout=" + discoveryInitialWaitTimeout +
"}";
", refreshTimeout=" + refreshTimeout +
", discoveryInitialWaitTimeout=" + discoveryInitialWaitTimeout +
'}';
}
}

8
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
View File

@ -252,16 +252,15 @@ public class TransportConfiguration implements Serializable {
public static String toStringParameters(Map<String, Object> params, Map<String, Object> extraProps) {
StringBuilder str = new StringBuilder();
str.append("{");
if (params != null) {
if (!params.isEmpty()) {
str.append("\n\t\t\t");
str.append("?");
}
boolean first = true;
for (Map.Entry<String, Object> entry : params.entrySet()) {
if (!first) {
str.append("\n\t\t\t");
str.append("&");
}
String key = entry.getKey();
@ -281,7 +280,7 @@ public class TransportConfiguration implements Serializable {
if (extraProps != null) {
for (Map.Entry<String, Object> entry : extraProps.entrySet()) {
if (!first) {
str.append("\n\t\t\t");
str.append("&");
}
String key = entry.getKey();
@ -293,7 +292,6 @@ public class TransportConfiguration implements Serializable {
}
}
}
str.append("\n\t\t}");
return str.toString();
}

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
View File

@ -1476,12 +1476,12 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
return "ServerLocatorImpl (identity=" + identity +
") [initialConnectors=" +
Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
",\n discoveryGroupConfiguration=" +
", discoveryGroupConfiguration=" +
discoveryGroupConfiguration +
"]";
}
return "ServerLocatorImpl [initialConnectors=" + Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
",\n discoveryGroupConfiguration=" +
", discoveryGroupConfiguration=" +
discoveryGroupConfiguration +
"]";
}

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java
View File

@ -149,6 +149,6 @@ public final class TopologyMemberImpl implements TopologyMember {
@Override
public String toString() {
return "TopologyMember[\n\t\tid = " + nodeId + "\n\t\tconnector=" + connector + "\n\t\tbackupGroupName=" + backupGroupName + "\n\t\tscaleDownGroupName=" + scaleDownGroupName + "]";
return "TopologyMember[id = " + nodeId + ", connector=" + connector + ", backupGroupName=" + backupGroupName + ", scaleDownGroupName=" + scaleDownGroupName + "]";
}
}

8
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
View File

@ -742,13 +742,13 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
@Override
public String toString() {
return "\n " + this.getClass().getSimpleName() + "@" +
return this.getClass().getSimpleName() + "@" +
Integer.toHexString(System.identityHashCode(this)) +
"\n [name=" +
" [name=" +
name +
",\n queue=" +
", queue=" +
queue +
"\n targetConnector=" +
" targetConnector=" +
this.serverLocator +
"]";
}

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -1961,7 +1961,7 @@ public class QueueImpl implements Queue {
@Override
public String toString() {
return "QueueImpl[name=" + name.toString() + ",\n postOffice=" + this.postOffice + ",\n temp=" + this.temporary + "]@" + Integer.toHexString(System.identityHashCode(this));
return "QueueImpl[name=" + name.toString() + ", postOffice=" + this.postOffice + ", temp=" + this.temporary + "]@" + Integer.toHexString(System.identityHashCode(this));
}
private synchronized void internalAddTail(final MessageReference ref) {