improved logging configuration, removed transactional from service
parent
85fd4e71ce
commit
960319b796
|
@ -30,6 +30,21 @@
|
||||||
<logger name="org.mitre.openid">
|
<logger name="org.mitre.openid">
|
||||||
<level value="info" />
|
<level value="info" />
|
||||||
</logger>
|
</logger>
|
||||||
|
<logger name="org.mitre.oauth2">
|
||||||
|
<level value="info" />
|
||||||
|
</logger>
|
||||||
|
<logger name="org.mitre.discovery">
|
||||||
|
<level value="info" />
|
||||||
|
</logger>
|
||||||
|
<logger name="org.mitre.jose">
|
||||||
|
<level value="info" />
|
||||||
|
</logger>
|
||||||
|
<logger name="org.mitre.jwt">
|
||||||
|
<level value="info" />
|
||||||
|
</logger>
|
||||||
|
<logger name="org.mitre.util">
|
||||||
|
<level value="info" />
|
||||||
|
</logger>
|
||||||
|
|
||||||
<!-- 3rdparty Loggers -->
|
<!-- 3rdparty Loggers -->
|
||||||
<logger name="org.springframework.core">
|
<logger name="org.springframework.core">
|
||||||
|
|
|
@ -62,7 +62,7 @@ import com.nimbusds.jwt.PlainJWT;
|
||||||
* @author jricher
|
* @author jricher
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service("defaultOAuth2ProviderTokenService")
|
||||||
public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityService {
|
public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityService {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(DefaultOAuth2ProviderTokenService.class);
|
private static Logger logger = LoggerFactory.getLogger(DefaultOAuth2ProviderTokenService.class);
|
||||||
|
|
|
@ -43,8 +43,7 @@ import com.google.common.collect.Collections2;
|
||||||
* @author Michael Joseph Walsh, aanganes
|
* @author Michael Joseph Walsh, aanganes
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service("defaultApprovedSiteService")
|
||||||
@Transactional
|
|
||||||
public class DefaultApprovedSiteService implements ApprovedSiteService {
|
public class DefaultApprovedSiteService implements ApprovedSiteService {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(DefaultApprovedSiteService.class);
|
private static Logger logger = LoggerFactory.getLogger(DefaultApprovedSiteService.class);
|
||||||
|
@ -159,11 +158,13 @@ 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();
|
||||||
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Predicate<ApprovedSite> isExpired = new Predicate<ApprovedSite>() {
|
private Predicate<ApprovedSite> isExpired = new Predicate<ApprovedSite>() {
|
||||||
|
|
Loading…
Reference in New Issue