[jboss-cvs] Picketlink SVN: r196 - in idm/trunk: picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 25 11:09:56 EDT 2010
Author: bdaw
Date: 2010-03-25 11:09:55 -0400 (Thu, 25 Mar 2010)
New Revision: 196
Modified:
idm/trunk/picketlink-idm-auth/src/main/java/org/picketlink/idm/auth/JBossIdentityIDMLoginModule.java
idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java
idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
Log:
- Small logging improvements. Log details about every LDAP search to be performed and number of returned results
Modified: idm/trunk/picketlink-idm-auth/src/main/java/org/picketlink/idm/auth/JBossIdentityIDMLoginModule.java
===================================================================
--- idm/trunk/picketlink-idm-auth/src/main/java/org/picketlink/idm/auth/JBossIdentityIDMLoginModule.java 2010-03-25 12:02:38 UTC (rev 195)
+++ idm/trunk/picketlink-idm-auth/src/main/java/org/picketlink/idm/auth/JBossIdentityIDMLoginModule.java 2010-03-25 15:09:55 UTC (rev 196)
@@ -166,17 +166,17 @@
}
else
{
- log.info("Unexpected error while logging in");
+ log.error("Unexpected error while logging in");
return false;
} }
catch (Exception e)
{
- log.info("Error when validating password: ",e);
+ log.error("Error when validating password: ",e);
}
}
catch (Exception e)
{
- log.info("Failed to validate password: ", e);
+ log.error("Failed to validate password: ", e);
}
}
return false;
Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java
===================================================================
--- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2010-03-25 12:02:38 UTC (rev 195)
+++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2010-03-25 15:09:55 UTC (rev 196)
@@ -415,9 +415,9 @@
}
catch (IdentityException e)
{
- if (log.isLoggable(Level.FINER))
+ if (log.isLoggable(Level.INFO))
{
- log.finer("Failed to create IdentityObject: " + e);
+ log.info("Failed to create IdentityObject: " + e);
}
}
@@ -453,9 +453,9 @@
}
catch (IdentityException e)
{
- if (log.isLoggable(Level.FINER))
+ if (log.isLoggable(Level.INFO))
{
- log.finer("Failed to create IdentityObject: " + e);
+ log.info("Failed to create IdentityObject: " + e);
}
}
@@ -480,9 +480,9 @@
}
catch (IdentityException e)
{
- if (log.isLoggable(Level.FINER))
+ if (log.isLoggable(Level.INFO))
{
- log.finer("Failed to remove IdentityObject: " + e);
+ log.info("Failed to remove IdentityObject: " + e);
}
}
}
@@ -525,9 +525,9 @@
}
catch (IdentityException e)
{
- if (log.isLoggable(Level.FINER))
+ if (log.isLoggable(Level.INFO))
{
- log.finer("Failed to create IdentityObject: " + e);
+ log.info("Failed to create IdentityObject: " + e);
}
}
@@ -547,9 +547,9 @@
}
catch (IdentityException e)
{
- if (log.isLoggable(Level.FINER))
+ if (log.isLoggable(Level.INFO))
{
- log.finer("Failed to create IdentityObject: " + e);
+ log.info("Failed to create IdentityObject: " + e);
}
}
Modified: idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java
===================================================================
--- idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-03-25 12:02:38 UTC (rev 195)
+++ idm/trunk/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2010-03-25 15:09:55 UTC (rev 196)
@@ -314,7 +314,10 @@
// Make it RFC 2253 compliant
LdapName validLDAPName = new LdapName(getTypeConfiguration(invocationCtx, type).getIdAttributeName().concat("=").concat(name));
- log.finer("creating ldap entry for: " + validLDAPName + "; " + attrs);
+ if (log.isLoggable(Level.FINER))
+ {
+ log.finer("creating ldap entry for: " + validLDAPName + "; " + attrs);
+ }
DirContext entry = ctx.createSubcontext(validLDAPName, attrs);
if (entry != null)
{
@@ -1822,7 +1825,10 @@
// Make it RFC 2253 compliant
LdapName validLDAPName = new LdapName(getConfiguration(invocationCtx).getRelationshipNameAttributeName().concat("=").concat(name));
- log.finer("creating ldap entry for: " + validLDAPName + "; " + attrs);
+ if (log.isLoggable(Level.FINER))
+ {
+ log.finer("creating ldap entry for: " + validLDAPName + "; " + attrs);
+ }
ctx.createSubcontext(validLDAPName, attrs);
}
catch (Exception e)
@@ -2837,6 +2843,36 @@
Control[] requestControls) throws NamingException, IdentityException
{
+ //Debug
+ if (log.isLoggable(Level.FINER))
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("Prepared LDAP Search ");
+ if (entryCtxs != null)
+ {
+ sb.append("; contexts: ").append(Arrays.toString(entryCtxs));
+ }
+ if (filter != null)
+ {
+ sb.append("; filter: ").append(filter);
+ }
+ if (filterArgs != null)
+ {
+ sb.append("; filter args: ").append(Arrays.toString(filterArgs));
+ }
+ if (returningAttributes != null)
+ {
+ sb.append("; returning attributes: ").append(Arrays.toString(returningAttributes));
+ }
+ if (searchScope != null)
+ {
+ sb.append("; searchScope: ").append(searchScope);
+ }
+
+ log.finer(sb.toString());
+ }
+
+
LdapContext ldapContext = getLDAPContext(ctx);
if (ldapContext != null)
@@ -2881,9 +2917,17 @@
{
results = ldapContext.search(entryCtxs[0], filter, filterArgs, searchControls);
}
- return Tools.toList(results);
+ List toReturn = Tools.toList(results);
+ if (log.isLoggable(Level.FINER) && toReturn != null)
+ {
+ log.finer("Search in " + entryCtxs[0] + " returned " + toReturn.size() + " entries");
+ }
+
+ return toReturn;
+
+
}
else
{
@@ -2899,10 +2943,19 @@
{
results = ldapContext.search(entryCtx, filter, filterArgs, searchControls);
}
- merged.addAll(Tools.toList(results));
+ List singleResult = Tools.toList(results);
+
+ if (log.isLoggable(Level.FINER) && merged != null)
+ {
+ log.finer("Search in " + entryCtx + " returned " + merged.size() + " entries");
+ }
+
+ merged.addAll(singleResult);
results.close();
}
+
+
return merged;
}
}
@@ -2937,6 +2990,11 @@
}
catch (IdentityException e)
{
+ if (log.isLoggable(Level.FINER))
+ {
+ log.finer("Failed to find IdentityObject in LDAP: " + io);
+ }
+
throw new IdentityException("Provided IdentityObject is not present in the store. Cannot operate on not stored objects.", e);
}
}
@@ -2968,11 +3026,21 @@
}
catch (Exception e)
{
+ if (log.isLoggable(Level.FINER))
+ {
+ log.finer("Failed to obtain LDAP connection!");
+ }
+
throw new IdentityException("Could not obtain LDAP connection: ", e);
}
if (ldapContext == null)
{
+ if (log.isLoggable(Level.FINER))
+ {
+ log.finer("Failed to obtain LDAP connection!");
+ }
+
throw new IdentityException("IllegalState: - Could not obtain LDAP connection");
}
More information about the jboss-cvs-commits
mailing list