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 2015/11/10 17:01:03 UTC
svn commit: r1713675 -
/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/TopologyWebConsolePlugin.java
Author: stefanegli
Date: Tue Nov 10 16:01:03 2015
New Revision: 1713675
URL: http://svn.apache.org/viewvc?rev=1713675&view=rev
Log:
SLING-5251 : adding debug infos to the topology webconsole re the SyncTokenService History
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/TopologyWebConsolePlugin.java
Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/TopologyWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/TopologyWebConsolePlugin.java?rev=1713675&r1=1713674&r2=1713675&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/TopologyWebConsolePlugin.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/TopologyWebConsolePlugin.java Tue Nov 10 16:01:03 2015
@@ -44,6 +44,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.apache.felix.webconsole.WebConsoleConstants;
@@ -52,14 +53,16 @@ import org.apache.sling.discovery.Instan
import org.apache.sling.discovery.InstanceFilter;
import org.apache.sling.discovery.TopologyEvent;
import org.apache.sling.discovery.TopologyEvent.Type;
+import org.apache.sling.discovery.TopologyEventListener;
+import org.apache.sling.discovery.TopologyView;
import org.apache.sling.discovery.base.commons.ClusterViewService;
import org.apache.sling.discovery.base.connectors.announcement.Announcement;
import org.apache.sling.discovery.base.connectors.announcement.AnnouncementRegistry;
import org.apache.sling.discovery.base.connectors.announcement.CachedAnnouncement;
import org.apache.sling.discovery.base.connectors.ping.ConnectorRegistry;
import org.apache.sling.discovery.base.connectors.ping.TopologyConnectorClientInformation;
-import org.apache.sling.discovery.TopologyEventListener;
-import org.apache.sling.discovery.TopologyView;
+import org.apache.sling.discovery.commons.providers.spi.base.ClusterSyncHistory;
+import org.apache.sling.discovery.commons.providers.spi.base.SyncTokenService;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -104,6 +107,12 @@ public class TopologyWebConsolePlugin ex
@Reference
private ConnectorRegistry connectorRegistry;
+ @Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY)
+ private SyncTokenService syncTokenService;
+
+ @Reference
+ private Config config;
+
private TopologyView currentView;
@Override
@@ -280,6 +289,25 @@ public class TopologyWebConsolePlugin ex
}
pw.println("</pre>");
pw.println("</br>");
+
+ pw.println("<p class=\"statline ui-state-highlight\">SyncTokenService History</p>");
+ pw.println("<pre>");
+ if (!config.useSyncTokenService()) {
+ pw.println("(disabled - useSyncTokenService flag is false)");
+ } else if (syncTokenService == null) {
+ pw.println("(no SyncTokenService available)");
+ } else {
+ ClusterSyncHistory clusterSyncHistory = syncTokenService.getClusterSyncHistory();
+ if (clusterSyncHistory == null) {
+ pw.println("(no history available)");
+ } else {
+ for (String syncHistoryEntry : clusterSyncHistory.getSyncHistory()) {
+ pw.println(syncHistoryEntry);
+ }
+ }
+ }
+ pw.println("</pre>");
+ pw.println("<br/>");
}
/**
@@ -873,6 +901,26 @@ public class TopologyWebConsolePlugin ex
}
pw.println();
}
+
+ pw.println("SyncTokenService History");
+ pw.println("---------------------------------------");
+ if (!config.useSyncTokenService()) {
+ pw.println("(disabled - useSyncTokenService flag is false)");
+ } else if (syncTokenService == null) {
+ pw.println("(no SyncTokenService available)");
+ } else {
+ ClusterSyncHistory clusterSyncHistory = syncTokenService.getClusterSyncHistory();
+ if (clusterSyncHistory == null) {
+ pw.println("(no history available)");
+ } else {
+ for (String syncHistoryEntry : clusterSyncHistory.getSyncHistory()) {
+ pw.println(syncHistoryEntry);
+ }
+ }
+ }
+ pw.println();
+ pw.println();
+
}
/**