github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

quieted logging on database cleanup tasks when no expired elements are found

pull/988/head
Justin Richer 2015-11-25 15:44:11 -05:00
parent fcfc620d51
commit 1ed3e2c47a
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java
View File

@ -121,8 +121,9 @@ public class DefaultOAuth2AuthorizationCodeService implements AuthorizationCodeS
repository.remove(code); repository.remove(code);
} }
if (codes.size() > 0) {
logger.info("Removed " + codes.size() + " expired authorization codes."); logger.info("Removed " + codes.size() + " expired authorization codes.");
}
} }
/** /**

8
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
View File

@ -423,14 +423,16 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi
*/ */
@Override @Override
public void clearExpiredTokens() { public void clearExpiredTokens() {
logger.info("Cleaning out all expired tokens"); logger.debug("Cleaning out all expired tokens");
// get all the duplicated tokens first to maintain consistency // get all the duplicated tokens first to maintain consistency
tokenRepository.clearDuplicateAccessTokens(); tokenRepository.clearDuplicateAccessTokens();
tokenRepository.clearDuplicateRefreshTokens(); tokenRepository.clearDuplicateRefreshTokens();
Collection<OAuth2AccessTokenEntity> accessTokens = getExpiredAccessTokens(); Collection<OAuth2AccessTokenEntity> accessTokens = getExpiredAccessTokens();
if (accessTokens.size() > 0) {
logger.info("Found " + accessTokens.size() + " expired access tokens"); logger.info("Found " + accessTokens.size() + " expired access tokens");
}
for (OAuth2AccessTokenEntity oAuth2AccessTokenEntity : accessTokens) { for (OAuth2AccessTokenEntity oAuth2AccessTokenEntity : accessTokens) {
try { try {
revokeAccessToken(oAuth2AccessTokenEntity); revokeAccessToken(oAuth2AccessTokenEntity);
@ -442,13 +444,17 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi
} }
Collection<OAuth2RefreshTokenEntity> refreshTokens = getExpiredRefreshTokens(); Collection<OAuth2RefreshTokenEntity> refreshTokens = getExpiredRefreshTokens();
if (refreshTokens.size() > 0) {
logger.info("Found " + refreshTokens.size() + " expired refresh tokens"); logger.info("Found " + refreshTokens.size() + " expired refresh tokens");
}
for (OAuth2RefreshTokenEntity oAuth2RefreshTokenEntity : refreshTokens) { for (OAuth2RefreshTokenEntity oAuth2RefreshTokenEntity : refreshTokens) {
revokeRefreshToken(oAuth2RefreshTokenEntity); revokeRefreshToken(oAuth2RefreshTokenEntity);
} }
Collection<AuthenticationHolderEntity> authHolders = getOrphanedAuthenticationHolders(); Collection<AuthenticationHolderEntity> authHolders = getOrphanedAuthenticationHolders();
if (authHolders.size() > 0) {
logger.info("Found " + authHolders.size() + " orphaned authentication holders"); logger.info("Found " + authHolders.size() + " orphaned authentication holders");
}
for(AuthenticationHolderEntity authHolder : authHolders) { for(AuthenticationHolderEntity authHolder : authHolders) {
authenticationHolderRepository.remove(authHolder); authenticationHolderRepository.remove(authHolder);
} }

2
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java
View File

@ -158,7 +158,9 @@ public class DefaultApprovedSiteService implements ApprovedSiteService {
logger.info("Clearing expired approved sites"); logger.info("Clearing expired approved sites");
Collection<ApprovedSite> expiredSites = getExpired(); Collection<ApprovedSite> expiredSites = getExpired();
if (expiredSites.size() > 0) {
logger.info("Found " + expiredSites.size() + " expired approved sites."); logger.info("Found " + expiredSites.size() + " expired approved sites.");
}
if (expiredSites != null) { if (expiredSites != null) {
for (ApprovedSite expired : expiredSites) { for (ApprovedSite expired : expiredSites) {
remove(expired); remove(expired);