[java-identity-provider] branch master updated: Update status page with new metadata resolver info.

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=05643d739796f2bfcde2576aadf2f25a3679a542

The following commit(s) were added to refs/heads/master by this push:
       new  05643d7   Update status page with new metadata resolver info.
05643d7 is described below

commit 05643d739796f2bfcde2576aadf2f25a3679a542
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri Jun 23 18:35:04 2017 -0400

    Update status page with new metadata resolver info.
---
 idp-war/src/main/webapp/WEB-INF/jsp/status.jsp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp b/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
index 2a64f6c..b9fe6c3 100644
--- a/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
+++ b/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
@@ -10,6 +10,8 @@
 <%@ page import="org.opensaml.saml.metadata.resolver.ChainingMetadataResolver" %>
 <%@ page import="org.opensaml.saml.metadata.resolver.MetadataResolver" %>
 <%@ page import="org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver" %>
+<%@ page import="org.opensaml.saml.metadata.resolver.ExtendedBatchMetadataResolver" %>
+<%@ page import="org.opensaml.saml.metadata.resolver.ExtendedRefreshableMetadataResolver" %>
 <%@ page import="net.shibboleth.idp.Version" %>
 <%@ page import="net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider" %>
 <%@ page import="net.shibboleth.idp.attribute.resolver.AttributeResolver" %>
@@ -83,14 +85,29 @@ for (final ReloadableService service : (Collection<ReloadableService>) request.g
                 for (final RefreshableMetadataResolver resolver : resolvers) {
                     final DateTime lastRefresh = resolver.getLastRefresh();
                     final DateTime lastUpdate = resolver.getLastUpdate();
+
+                    DateTime lastSuccessfulRefresh = null;
+                    if (resolver instanceof ExtendedRefreshableMetadataResolver) {
+                        lastSuccessfulRefresh = ((ExtendedRefreshableMetadataResolver)resolver).getLastSuccessfulRefresh();
+                    }
+                    DateTime rootValidUntil = null;
+                    if (resolver instanceof ExtendedBatchMetadataResolver) {
+                        rootValidUntil = ((ExtendedBatchMetadataResolver)resolver).getRootValidUntil();
+                    }
     
                     out.println("\tmetadata source: " + resolver.getId());
                     if (lastRefresh != null) {
                         out.println("\tlast refresh attempt: " + lastRefresh.toString(dateTimeFormatter));
                     }
+                    if (lastSuccessfulRefresh != null) {
+                        out.println("\tlast successful refresh: " + lastSuccessfulRefresh.toString(dateTimeFormatter));
+                    }
                     if (lastUpdate != null) {
                         out.println("\tlast update: " + lastUpdate.toString(dateTimeFormatter));
                     }
+                    if (rootValidUntil != null) {
+                        out.println("\troot validUntil: " + rootValidUntil.toString(dateTimeFormatter));
+                    }
                     out.println();
                 }
             } finally {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.