You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2017/05/05 12:29:57 UTC

svn commit: r1794027 - /sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/DefaultTopologyView.java

Author: stefanegli
Date: Fri May  5 12:29:57 2017
New Revision: 1794027

URL: http://svn.apache.org/viewvc?rev=1794027&view=rev
Log:
SLING-6809 : toString improved to enlist more details - including a paranoia fallback that goes to the previous output in case of any Exception

Modified:
    sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/DefaultTopologyView.java

Modified: sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/DefaultTopologyView.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/DefaultTopologyView.java?rev=1794027&r1=1794026&r2=1794027&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/DefaultTopologyView.java (original)
+++ sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/commons/DefaultTopologyView.java Fri May  5 12:29:57 2017
@@ -243,8 +243,32 @@ public class DefaultTopologyView extends
 
     @Override
     public String toString() {
+        StringBuilder sb = new StringBuilder();
+        try{
+            boolean firstCluster = true;
+            for (ClusterView clusterView : getClusterViews()) {
+                if (!firstCluster) {
+                    sb.append(", ");
+                }
+                firstCluster = false;
+                sb.append("[clusterId=" + clusterView.getId() + ", instances=");
+                boolean firstInstance = true;
+                for (InstanceDescription id : clusterView.getInstances()) {
+                    if (!firstInstance) {
+                        sb.append(", ");
+                    }
+                    firstInstance = false;
+                    sb.append("[id=" + id.getSlingId() + ", isLeader=" + id.isLeader() + 
+                            ", isLocal=" + id.isLocal() + "]");
+                }
+                sb.append("]");
+            }
+        } catch(Exception e) {
+            // paranoia fallback
+            sb = new StringBuilder(instances.toString());
+        }
         return "DefaultTopologyView[current=" + isCurrent() + ", num=" + instances.size() + ", instances="
-                + instances + "]";
+                + sb + "]";
     }
 
     @Override