[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: system/flows/status/status-beans.xml system/fl...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Sep 25 17:00:11 2014
New Revision: 6574

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6574&view=rev
Log:
IDP-253 - add service reload status to status page

Modified:
    trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml
    trunk/idp-conf/src/main/resources/views/status.vm

Modified: trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml?rev=6574&r1=6573&r2=6574&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml Thu Sep 25 17:00:11 2014
@@ -20,6 +20,15 @@
 
     <!-- Declares audit field extractor functions injected into beans that populate the audit context. -->
     <import resource="../../conf/audit-system.xml" />
+    
+    <util:list id="ServiceCollection">
+        <ref bean="shibboleth.ReloadableAccessControlService" />
+        <ref bean="shibboleth.MetadataResolverService" />
+        <ref bean="shibboleth.RelyingPartyResolverService" />
+        <ref bean="shibboleth.NameIdentifierGenerationService" />
+        <ref bean="shibboleth.AttributeResolverService" />
+        <ref bean="shibboleth.AttributeFilterService" />
+    </util:list>
 
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml?rev=6574&r1=6573&r2=6574&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml Thu Sep 25 17:00:11 2014
@@ -15,6 +15,7 @@
     <end-state id="Status" view="status">
         <on-entry>
             <evaluate expression="WriteAuditLog" />
+            <evaluate expression="ServiceCollection" result="requestScope.services" />
             <evaluate expression="T(java.lang.Runtime).getRuntime()" result="requestScope.runtime" />
             <evaluate expression="T(java.lang.System)" result="requestScope.System" />
             <evaluate expression="T(net.shibboleth.idp.Version)" result="requestScope.Version" />

Modified: trunk/idp-conf/src/main/resources/views/status.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/status.vm?rev=6574&r1=6573&r2=6574&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/status.vm (original)
+++ trunk/idp-conf/src/main/resources/views/status.vm Thu Sep 25 17:00:11 2014
@@ -30,4 +30,17 @@
 #set ($uptime = $now.getMillis() - $startupTime.getMillis()) 
 uptime: $uptime ms
 
+#foreach ($service in $services)
+service: $service.getId()
+#if ($service.getLastSuccessfulReloadInstant())
+last successful reload attempt: $service.getLastSuccessfulReloadInstant().toString($dateTimeFormatter)
+#end
+#if ($service.getLastReloadAttemptInstant())
+last reload attempt: $service.getLastReloadAttemptInstant().toString($dateTimeFormatter)
+#end
+#if ($service.getReloadFailureCause())
+last failure cause: $service.getReloadFailureCause().getClass().getName(): $service.getReloadFailureCause().getMessage()
+#end
+#end
+
 $response.setContentType("text/plain")