[java-opensaml] 20/24: OSJ-200: Improve logging around expired metadata refresh attempts

[Brent Putman]

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

putmanb pushed a commit to branch maint-3.3
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=acfb8b3c63992724d814a46430f99334e911e771

commit acfb8b3c63992724d814a46430f99334e911e771
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri May 5 17:16:31 2017 -0400

    OSJ-200: Improve logging around expired metadata refresh attempts
    
    Log on INFO when keeping cached metadata (no new bytes).
    Log on WARN when post-refresh cached/live metadata is expired/invalid.
    Log on WARN when resolution throws out an expired/invalid
    EntityDescriptor.
---
 .../saml/metadata/resolver/impl/AbstractMetadataResolver.java      | 2 +-
 .../metadata/resolver/impl/AbstractReloadingMetadataResolver.java  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
index 8f76da4..89ec0d4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
@@ -440,7 +440,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
         while (entitiesIter.hasNext()) {
             final EntityDescriptor descriptor = entitiesIter.next();
             if (!isValid(descriptor)) {
-                log.debug("{} Metadata backing store contained an EntityDescriptor with the ID: {}, " 
+                log.warn("{} Metadata backing store contained an EntityDescriptor with the ID: {}, " 
                         + " but it was no longer valid", getLogPrefix(), entityID);
                 entitiesIter.remove();
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
index 8c482ef..2f98ebb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
@@ -299,7 +299,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
         
             final byte[] mdBytes = fetchMetadata();
             if (mdBytes == null) {
-                log.debug("{} Metadata from '{}' has not changed since last refresh", getLogPrefix(), mdId);
+                log.info("{} Metadata from '{}' has not changed since last refresh", getLogPrefix(), mdId);
                 processCachedMetadata(mdId, now);
             } else {
                 log.debug("{} Processing new metadata from '{}'", getLogPrefix(), mdId);
@@ -315,6 +315,11 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
                         t.getClass().getName(), t.getMessage()));
             }
         } finally {
+            final XMLObject cached = getBackingStore().getCachedOriginalMetadata();
+            if (cached != null && !isValid(cached)) {
+                log.warn("{} Metadata root from '{}' currently live (post-refresh) is expired or otherwise invalid", 
+                        getLogPrefix(), mdId);
+            }
             refreshMetadataTask = new RefreshMetadataTask();
             final long nextRefreshDelay = nextRefresh.getMillis() - System.currentTimeMillis();
             taskTimer.schedule(refreshMetadataTask, nextRefreshDelay);

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