Quantcast

[1/2] activemq-artemis git commit: This closes #1276

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[1/2] activemq-artemis git commit: This closes #1276

clebertsuconic-2
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 97843a023 -> 88cf826dc


This closes #1276


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/88cf826d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/88cf826d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/88cf826d

Branch: refs/heads/master
Commit: 88cf826dcaaa12fdcc347d4729649b32e45720d7
Parents: 97843a0 744221d
Author: Clebert Suconic <[hidden email]>
Authored: Wed May 17 14:11:08 2017 -0400
Committer: Clebert Suconic <[hidden email]>
Committed: Wed May 17 14:11:08 2017 -0400

----------------------------------------------------------------------
 .../artemis/api/core/DiscoveryGroupConfiguration.java        | 6 +++---
 .../activemq/artemis/api/core/TransportConfiguration.java    | 8 +++++---
 .../activemq/artemis/core/client/impl/ServerLocatorImpl.java | 4 ++--
 .../artemis/core/client/impl/TopologyMemberImpl.java         | 2 +-
 .../artemis/core/server/cluster/impl/BridgeImpl.java         | 8 ++++----
 .../apache/activemq/artemis/core/server/impl/QueueImpl.java  | 2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[2/2] activemq-artemis git commit: [ARTEMIS-1171] Improve log readability around clustering

clebertsuconic-2
[ARTEMIS-1171] Improve log readability around clustering

Issue: https://issues.apache.org/jira/browse/ARTEMIS-1171


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/744221dc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/744221dc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/744221dc

Branch: refs/heads/master
Commit: 744221dcb5f250d724a72f0321144630ecb2eab7
Parents: 97843a0
Author: Ingo Weiss <[hidden email]>
Authored: Wed May 17 14:38:01 2017 +0100
Committer: Clebert Suconic <[hidden email]>
Committed: Wed May 17 14:11:08 2017 -0400

----------------------------------------------------------------------
 .../artemis/api/core/DiscoveryGroupConfiguration.java        | 6 +++---
 .../activemq/artemis/api/core/TransportConfiguration.java    | 8 +++++---
 .../activemq/artemis/core/client/impl/ServerLocatorImpl.java | 4 ++--
 .../artemis/core/client/impl/TopologyMemberImpl.java         | 2 +-
 .../artemis/core/server/cluster/impl/BridgeImpl.java         | 8 ++++----
 .../apache/activemq/artemis/core/server/impl/QueueImpl.java  | 2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/744221dc/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
index 11985fb..347e0c9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/DiscoveryGroupConfiguration.java
@@ -129,8 +129,8 @@ public final class DiscoveryGroupConfiguration implements Serializable {
    public String toString() {
       return "DiscoveryGroupConfiguration{" +
          "name='" + name + '\'' +
-         ", refreshTimeout=" + refreshTimeout +
-         ", discoveryInitialWaitTimeout=" + discoveryInitialWaitTimeout +
-         '}';
+         ",\n refreshTimeout=" + refreshTimeout +
+         ",\n discoveryInitialWaitTimeout=" + discoveryInitialWaitTimeout +
+         "}";
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/744221dc/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
index 71679b5..d019735 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
@@ -252,15 +252,16 @@ 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("?");
+            str.append("\n\t\t\t");
          }
 
          boolean first = true;
          for (Map.Entry<String, Object> entry : params.entrySet()) {
             if (!first) {
-               str.append("&");
+               str.append("\n\t\t\t");
             }
 
             String key = entry.getKey();
@@ -280,7 +281,7 @@ public class TransportConfiguration implements Serializable {
          if (extraProps != null) {
             for (Map.Entry<String, Object> entry : extraProps.entrySet()) {
                if (!first) {
-                  str.append("&");
+                  str.append("\n\t\t\t");
                }
 
                String key = entry.getKey();
@@ -292,6 +293,7 @@ public class TransportConfiguration implements Serializable {
             }
          }
       }
+      str.append("\n\t\t}");
       return str.toString();
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/744221dc/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index 949ef90..c6bf59b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -1476,12 +1476,12 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
          return "ServerLocatorImpl (identity=" + identity +
             ") [initialConnectors=" +
             Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
-            ", discoveryGroupConfiguration=" +
+            ",\n discoveryGroupConfiguration=" +
             discoveryGroupConfiguration +
             "]";
       }
       return "ServerLocatorImpl [initialConnectors=" + Arrays.toString(initialConnectors == null ? new TransportConfiguration[0] : initialConnectors) +
-         ", discoveryGroupConfiguration=" +
+         ",\n discoveryGroupConfiguration=" +
          discoveryGroupConfiguration +
          "]";
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/744221dc/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java
index c82a939..b28f785 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/TopologyMemberImpl.java
@@ -149,6 +149,6 @@ public final class TopologyMemberImpl implements TopologyMember {
 
    @Override
    public String toString() {
-      return "TopologyMember[id = " + nodeId + ", connector=" + connector + ", backupGroupName=" + backupGroupName + ", scaleDownGroupName=" + scaleDownGroupName + "]";
+      return "TopologyMember[\n\t\tid = " + nodeId + "\n\t\tconnector=" + connector + "\n\t\tbackupGroupName=" + backupGroupName + "\n\t\tscaleDownGroupName=" + scaleDownGroupName + "]";
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/744221dc/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 1e5a92b..9863102 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -736,13 +736,13 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
 
    @Override
    public String toString() {
-      return this.getClass().getSimpleName() + "@" +
+      return "\n " + this.getClass().getSimpleName() + "@" +
          Integer.toHexString(System.identityHashCode(this)) +
-         " [name=" +
+         "\n [name=" +
          name +
-         ", queue=" +
+         ",\n queue=" +
          queue +
-         " targetConnector=" +
+         "\n targetConnector=" +
          this.serverLocator +
          "]";
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/744221dc/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 002e511..2c4f91f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -1961,7 +1961,7 @@ public class QueueImpl implements Queue {
 
    @Override
    public String toString() {
-      return "QueueImpl[name=" + name.toString() + ", postOffice=" + this.postOffice + ", temp=" + this.temporary + "]@" + Integer.toHexString(System.identityHashCode(this));
+      return "QueueImpl[name=" + name.toString() + ",\n postOffice=" + this.postOffice + ",\n temp=" + this.temporary + "]@" + Integer.toHexString(System.identityHashCode(this));
    }
 
    private synchronized void internalAddTail(final MessageReference ref) {

Loading...