From cf747dac2296561db981960e5901fec63a3bc44e Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Thu, 30 Oct 2014 09:53:06 -0400 Subject: [PATCH] remove info logging --- .../connections/mongo/impl/MongoStoreImpl.java | 4 ++-- .../federation/ldap/LDAPFederationProvider.java | 4 ++-- .../java/org/keycloak/adapters/CookieTokenStore.java | 2 +- .../adapters/NodesRegistrationManagement.java | 8 ++++---- .../org/keycloak/adapters/PreAuthActionsHandler.java | 2 +- .../keycloak/adapters/jboss/KeycloakLoginModule.java | 2 +- .../adapters/tomcat7/KeycloakAuthenticatorValve.java | 6 +++--- .../wildfly/WildflyKeycloakServletExtension.java | 2 +- .../mongo/keycloak/entities/MongoRoleEntity.java | 4 ++-- .../keycloak/protocol/oidc/OpenIDConnectService.java | 2 +- .../services/managers/ResourceAdminManager.java | 12 ++++++------ .../services/resources/ClientsManagementService.java | 4 ++-- .../resources/admin/ApplicationResource.java | 6 +++--- .../services/resources/admin/RoleByIdResource.java | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) mode change 100644 => 100755 integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java mode change 100644 => 100755 integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java diff --git a/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/MongoStoreImpl.java b/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/MongoStoreImpl.java index 85bf25e3d6..35a7e42535 100755 --- a/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/MongoStoreImpl.java +++ b/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/MongoStoreImpl.java @@ -259,7 +259,7 @@ public class MongoStoreImpl implements MongoStore { DBCollection dbCollection = getDBCollectionForType(type); BasicDBObject dbQuery = new BasicDBObject("_id", id); dbCollection.remove(dbQuery); - logger.info("Entity of type: " + type + ", id: " + id + " removed from MongoDB."); + //logger.debugf("Entity of type: %s , id: %s removed from MongoDB.", type, id); context.addRemovedEntity(found); return true; @@ -275,7 +275,7 @@ public class MongoStoreImpl implements MongoStore { } else { DBCollection dbCollection = getDBCollectionForType(type); dbCollection.remove(query); - logger.info("Removed " + foundObjects.size() + " entities of type: " + type + ", query: " + query); + //logger.debug("Removed %d" + foundObjects.size() + " entities of type: " + type + ", query: " + query); for (MongoIdentifiableEntity found : foundObjects) { context.addRemovedEntity(found);; diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java index eed99122cc..8597d84858 100755 --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java @@ -309,7 +309,7 @@ public class LDAPFederationProvider implements UserFederationProvider { if (currentUser == null) { // Add new user to Keycloak importUserFromPicketlink(realm, picketlinkUser); - logger.infof("Added new user from LDAP: " + username); + logger.debugf("Added new user from LDAP: %s", username); } else { if ((fedModel.getId().equals(currentUser.getFederationLink())) && (picketlinkUser.getId().equals(currentUser.getAttribute(LDAPFederationProvider.LDAP_ID)))) { // Update keycloak user @@ -317,7 +317,7 @@ public class LDAPFederationProvider implements UserFederationProvider { currentUser.setEmail(email); currentUser.setFirstName(picketlinkUser.getFirstName()); currentUser.setLastName(picketlinkUser.getLastName()); - logger.infof("Updated user from LDAP: " + currentUser.getUsername()); + logger.debugf("Updated user from LDAP: %s", currentUser.getUsername()); } else { logger.warnf("User '%s' is not updated during sync as he is not linked to federation provider '%s'", username, fedModel.getDisplayName()); } diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java old mode 100644 new mode 100755 index 23e017df68..2f0956150b --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java @@ -20,7 +20,7 @@ public class CookieTokenStore { private static final String DELIM = "@"; public static void setTokenCookie(KeycloakDeployment deployment, HttpFacade facade, RefreshableKeycloakSecurityContext session) { - log.infof("Set new %s cookie now", AdapterConstants.KEYCLOAK_ADAPTER_STATE_COOKIE); + log.debugf("Set new %s cookie now", AdapterConstants.KEYCLOAK_ADAPTER_STATE_COOKIE); String accessToken = session.getTokenString(); String idToken = session.getIdTokenString(); String refreshToken = session.getRefreshToken(); diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java old mode 100644 new mode 100755 index 5365620d8b..0e9234fc0c --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java @@ -62,14 +62,14 @@ public class NodesRegistrationManagement { } protected void sendRegistrationEvent(KeycloakDeployment deployment) { - log.info("Sending registration event right now"); + log.debug("Sending registration event right now"); String host = HostUtils.getIpAddress(); try { ServerRequest.invokeRegisterNode(deployment, host); NodeRegistrationContext regContext = new NodeRegistrationContext(Time.currentTime(), deployment); nodeRegistrations.put(deployment.getRegisterNodeUrl(), regContext); - log.infof("Node '%s' successfully registered in Keycloak", host); + log.debugf("Node '%s' successfully registered in Keycloak", host); } catch (ServerRequest.HttpFailure failure) { log.error("failed to register node to keycloak"); log.error("status from server: " + failure.getStatus()); @@ -82,12 +82,12 @@ public class NodesRegistrationManagement { } protected boolean sendUnregistrationEvent(KeycloakDeployment deployment) { - log.info("Sending Unregistration event right now"); + log.debug("Sending Unregistration event right now"); String host = HostUtils.getIpAddress(); try { ServerRequest.invokeUnregisterNode(deployment, host); - log.infof("Node '%s' successfully unregistered from Keycloak", host); + log.debugf("Node '%s' successfully unregistered from Keycloak", host); return true; } catch (ServerRequest.HttpFailure failure) { log.error("failed to unregister node from keycloak"); diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java index 83cad53a19..aea33dd305 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java @@ -116,7 +116,7 @@ public class PreAuthActionsHandler { if (action.getAdapterSessionIds() != null) { userSessionManagement.logoutHttpSessions(action.getAdapterSessionIds()); } else { - log.infof("logout of all sessions for application '%s'", action.getResource()); + log.debugf("logout of all sessions for application '%s'", action.getResource()); if (action.getNotBefore() > deployment.getNotBefore()) { deployment.setNotBefore(action.getNotBefore()); } diff --git a/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java b/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java index 8f74f7eba0..f32b2b8155 100755 --- a/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java +++ b/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java @@ -31,7 +31,7 @@ public class KeycloakLoginModule extends AbstractServerLoginModule { public boolean login() throws LoginException { log.debug("KeycloakLoginModule.login()"); if (super.login() == true) { - log.info("super.login()==true"); + log.debug("super.login()==true"); return true; } diff --git a/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java b/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java index 73d0cc9c31..48b3c4e0f8 100755 --- a/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java +++ b/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java @@ -117,8 +117,8 @@ public class KeycloakAuthenticatorValve extends FormAuthenticator implements Lif if (json == null) { return null; } - log.info("**** using " + AdapterConstants.AUTH_DATA_PARAM_NAME); - log.info(json); + log.finest("**** using " + AdapterConstants.AUTH_DATA_PARAM_NAME); + log.finest(json); return new ByteArrayInputStream(json.getBytes()); } @@ -127,7 +127,7 @@ public class KeycloakAuthenticatorValve extends FormAuthenticator implements Lif if (is == null) { String path = context.getServletContext().getInitParameter("keycloak.config.file"); if (path == null) { - log.info("**** using /WEB-INF/keycloak.json"); + log.finest("**** using /WEB-INF/keycloak.json"); is = context.getServletContext().getResourceAsStream("/WEB-INF/keycloak.json"); } else { try { diff --git a/integration/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java b/integration/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java index 6130d9b136..0cdf2f90e7 100755 --- a/integration/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java +++ b/integration/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java @@ -18,7 +18,7 @@ public class WildflyKeycloakServletExtension extends KeycloakServletExtension { @Override protected ServletKeycloakAuthMech createAuthenticationMechanism(DeploymentInfo deploymentInfo, AdapterDeploymentContext deploymentContext, UndertowUserSessionManagement userSessionManagement, NodesRegistrationManagement nodesRegistrationManagement) { - log.info("creating WildflyAuthenticationMechanism"); + log.debug("creating WildflyAuthenticationMechanism"); return new WildflyAuthenticationMechanism(deploymentContext, userSessionManagement, nodesRegistrationManagement, deploymentInfo.getConfidentialPortManager()); } diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoRoleEntity.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoRoleEntity.java index cf0cfed248..1de58a88d7 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoRoleEntity.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/entities/MongoRoleEntity.java @@ -48,7 +48,7 @@ public class MongoRoleEntity extends RoleEntity implements MongoIdentifiableEnti List users = mongoStore.loadEntities(MongoUserEntity.class, query, invContext); for (MongoUserEntity user : users) { - logger.info("Removing role " + getName() + " from user " + user.getUsername()); + //logger.info("Removing role " + getName() + " from user " + user.getUsername()); mongoStore.pullItemFromList(user, "roleIds", getId(), invContext); } @@ -59,7 +59,7 @@ public class MongoRoleEntity extends RoleEntity implements MongoIdentifiableEnti users = mongoStore.loadEntities(MongoUserEntity.class, query, invContext); for (MongoUserEntity user : users) { - logger.info("Removing scope " + getName() + " from user " + user.getUsername()); + //logger.info("Removing scope " + getName() + " from user " + user.getUsername()); mongoStore.pullItemFromList(user, "scopeIds", getId(), invContext); } diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OpenIDConnectService.java b/services/src/main/java/org/keycloak/protocol/oidc/OpenIDConnectService.java index 0ac16b9b12..96c3ef6c5a 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OpenIDConnectService.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OpenIDConnectService.java @@ -620,7 +620,7 @@ public class OpenIDConnectService { String adapterSessionId = formData.getFirst(AdapterConstants.APPLICATION_SESSION_STATE); if (adapterSessionId != null) { String adapterSessionHost = formData.getFirst(AdapterConstants.APPLICATION_SESSION_HOST); - logger.infof("Adapter Session '%s' saved in ClientSession for client '%s'. Host is '%s'", adapterSessionId, client.getClientId(), adapterSessionHost); + logger.debugf("Adapter Session '%s' saved in ClientSession for client '%s'. Host is '%s'", adapterSessionId, client.getClientId(), adapterSessionHost); event.detail(AdapterConstants.APPLICATION_SESSION_STATE, adapterSessionId); clientSession.setNote(AdapterConstants.APPLICATION_SESSION_STATE, adapterSessionId); diff --git a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java index 834fca8888..7760e52c7c 100755 --- a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java @@ -106,7 +106,7 @@ public class ResourceAdminManager { } logger.debugv("logging out {0} resources ", clientSessions.size()); - logger.infov("logging out resources: " + clientSessions); + //logger.infov("logging out resources: {0}", clientSessions); for (Map.Entry> entry : clientSessions.entrySet()) { logoutClientSessions(requestUri, realm, entry.getKey(), entry.getValue(), executor); @@ -251,7 +251,7 @@ public class ResourceAdminManager { return new GlobalRequestResult(); } - logger.info("Send logoutApplication for URLs: " + mgmtUrls); + if (logger.isDebugEnabled()) logger.debug("Send logoutApplication for URLs: " + mgmtUrls); // Propagate this to all hosts GlobalRequestResult result = new GlobalRequestResult(); @@ -268,7 +268,7 @@ public class ResourceAdminManager { protected boolean sendLogoutRequest(RealmModel realm, ApplicationModel resource, List adapterSessionIds, ApacheHttpClient4Executor client, int notBefore, String managementUrl) { LogoutAction adminAction = new LogoutAction(TokenIdGenerator.generateId(), Time.currentTime() + 30, resource.getName(), adapterSessionIds, notBefore); String token = new TokenManager().encodeToken(realm, adminAction); - logger.infov("logout resource {0} url: {1} sessionIds: " + adapterSessionIds, resource.getName(), managementUrl); + if (logger.isDebugEnabled()) logger.debugv("logout resource {0} url: {1} sessionIds: " + adapterSessionIds, resource.getName(), managementUrl); ClientRequest request = client.createRequest(UriBuilder.fromUri(managementUrl).path(AdapterConstants.K_LOGOUT).build().toString()); ClientResponse response; try { @@ -319,7 +319,7 @@ public class ResourceAdminManager { return new GlobalRequestResult(); } - logger.info("Sending push revocation to URLS: " + mgmtUrls); + if (logger.isDebugEnabled()) logger.info("Sending push revocation to URLS: " + mgmtUrls); // Propagate this to all hosts GlobalRequestResult result = new GlobalRequestResult(); @@ -364,7 +364,7 @@ public class ResourceAdminManager { ApacheHttpClient4Executor executor = createExecutor(); try { - logger.info("Sending test nodes availability: " + mgmtUrls); + if (logger.isDebugEnabled()) logger.debug("Sending test nodes availability: " + mgmtUrls); // Propagate this to all hosts GlobalRequestResult result = new GlobalRequestResult(); @@ -384,7 +384,7 @@ public class ResourceAdminManager { protected boolean sendTestNodeAvailabilityRequest(RealmModel realm, ApplicationModel application, ApacheHttpClient4Executor client, String managementUrl) { TestAvailabilityAction adminAction = new TestAvailabilityAction(TokenIdGenerator.generateId(), Time.currentTime() + 30, application.getName()); String token = new TokenManager().encodeToken(realm, adminAction); - logger.infov("testNodes availability resource: {0} url: {1}", application.getName(), managementUrl); + logger.debugv("testNodes availability resource: {0} url: {1}", application.getName(), managementUrl); ClientRequest request = client.createRequest(UriBuilder.fromUri(managementUrl).path(AdapterConstants.K_TEST_AVAILABLE).build().toString()); ClientResponse response; try { diff --git a/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java b/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java old mode 100644 new mode 100755 index 80cdb25f35..0ce2793145 --- a/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java +++ b/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java @@ -109,7 +109,7 @@ public class ClientsManagementService { String nodeHost = getApplicationClusterHost(formData); event.client(application).detail(Details.NODE_HOST, nodeHost); - logger.infof("Registering cluster host '%s' for client '%s'", nodeHost, application.getName()); + logger.debugf("Registering cluster host '%s' for client '%s'", nodeHost, application.getName()); application.registerNode(nodeHost, Time.currentTime()); @@ -145,7 +145,7 @@ public class ClientsManagementService { String nodeHost = getApplicationClusterHost(formData); event.client(application).detail(Details.NODE_HOST, nodeHost); - logger.infof("Unregistering cluster host '%s' for client '%s'", nodeHost, application.getName()); + logger.debugf("Unregistering cluster host '%s' for client '%s'", nodeHost, application.getName()); application.unregisterNode(nodeHost); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java index 5d4f176e43..a5a4ec9f85 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java @@ -372,7 +372,7 @@ public class ApplicationResource { if (node == null) { throw new BadRequestException("Node not found in params"); } - logger.info("Register node: " + node); + if (logger.isDebugEnabled()) logger.debug("Register node: " + node); application.registerNode(node, Time.currentTime()); } @@ -386,7 +386,7 @@ public class ApplicationResource { @NoCache public void unregisterNode(final @PathParam("node") String node) { auth.requireManage(); - logger.info("Unregister node: " + node); + if (logger.isDebugEnabled()) logger.debug("Unregister node: " + node); Integer time = application.getRegisteredNodes().get(node); if (time == null) { @@ -406,7 +406,7 @@ public class ApplicationResource { @NoCache public GlobalRequestResult testNodesAvailable() { auth.requireManage(); - logger.info("Test availability of cluster nodes"); + logger.debug("Test availability of cluster nodes"); return new ResourceAdminManager().testNodesAvailability(uriInfo.getRequestUri(), realm, application); } diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java index 9f26e8db31..96c71f2fb3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java @@ -132,7 +132,7 @@ public class RoleByIdResource extends RoleResource { @Produces("application/json") public Set getRoleComposites(final @PathParam("role-id") String id) { - logger.info("*** getRoleComposites: '" + id + "'"); + if (logger.isDebugEnabled()) logger.debug("*** getRoleComposites: '" + id + "'"); RoleModel role = getRoleModel(id); auth.requireView(); return getRoleComposites(role);