Author: bdaw
Date: 2009-11-11 17:20:53 -0500 (Wed, 11 Nov 2009)
New Revision: 927
Modified:
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAPICacheProviderImpl.java
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java
Log:
- improve caching layer logging
Modified:
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAPICacheProviderImpl.java
===================================================================
---
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAPICacheProviderImpl.java 2009-11-11
22:03:01 UTC (rev 926)
+++
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheAPICacheProviderImpl.java 2009-11-11
22:20:53 UTC (rev 927)
@@ -200,7 +200,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "User stored in cache: " + user.getId());
+ log.finer(this.toString() + "User stored in cache: " + user.getId() +
";namespace=" + ns);
}
}
@@ -216,7 +216,7 @@
if (log.isLoggable(Level.FINER) && user != null)
{
- log.finer(this.toString() + "User found in cache: id=" +
user.getId());
+ log.finer(this.toString() + "User found in cache: id=" +
user.getId() + ";namespace=" + ns);
}
return user;
@@ -233,7 +233,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "User removed from cache: id= " + id);
+ log.finer(this.toString() + "User removed from cache: id= " + id +
";namespace=" + ns);
}
}
@@ -248,7 +248,7 @@
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "User criteria search stored in cache:
users.size()=" + users.size() +
- "; criteria.hash()=" + criteria.hashCode());
+ "; criteria.hash()=" + criteria.hashCode() + ";namespace=" +
ns);
}
}
@@ -265,7 +265,7 @@
if (log.isLoggable(Level.FINER) && users != null)
{
log.finer(this.toString() + "User criteria search found in cache:
users.size()=" + users.size() +
- "; criteria.hash()=" + criteria.hashCode());
+ "; criteria.hash()=" + criteria.hashCode() + ";namespace=" +
ns);
}
return users;
@@ -283,7 +283,7 @@
getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns),
NODE_USERS_SEARCHES));
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating Users cache. Namespace:" +
ns);
+ log.finer(this.toString() + "Invalidating Users cache. Namespace:" +
ns + ";namespace=" + ns);
}
}
@@ -297,7 +297,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Users count stored in cache: " + count);
+ log.finer(this.toString() + "Users count stored in cache: " + count +
";namespace=" + ns);
}
}
@@ -318,7 +318,7 @@
if (log.isLoggable(Level.FINER) && count != -1)
{
- log.finer(this.toString() + "User count found in cache: " +
count);
+ log.finer(this.toString() + "User count found in cache: " + count +
";namespace=" + ns);
}
return count;
@@ -332,7 +332,7 @@
getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns),
NODE_USERS_COUNT));
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating User count. Namespace:" +
ns);
+ log.finer(this.toString() + "Invalidating User count. Namespace:" + ns
+ ";namespace=" + ns);
}
}
@@ -346,7 +346,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Group stored in cache: " +
group.getKey());
+ log.finer(this.toString() + "Group stored in cache: " + group.getKey()
+ ";namespace=" + ns);
}
}
@@ -362,7 +362,7 @@
if (log.isLoggable(Level.FINER) && group != null)
{
- log.finer(this.toString() + "Group found in cache: id=" +
group.getKey());
+ log.finer(this.toString() + "Group found in cache: id=" +
group.getKey() + ";namespace=" + ns);
}
return group;
@@ -379,7 +379,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Group removed from cache: id= " +
GroupKey.parseKey(groupName, groupType));
+ log.finer(this.toString() + "Group removed from cache: id= " +
GroupKey.parseKey(groupName, groupType)
+ + ";namespace=" + ns);
}
}
@@ -394,7 +395,7 @@
if (log.isLoggable(Level.FINER))
{
log.finer(this.toString() + "Group criteria search stored in cache:
groups.size()=" + groups.size() +
- "; criteria.hash()=" + criteria.hashCode());
+ "; criteria.hash()=" + criteria.hashCode() + ";namespace=" +
ns);
}
}
@@ -411,7 +412,7 @@
if (log.isLoggable(Level.FINER) && groups != null)
{
log.finer(this.toString() + "Group criteria search found in cache:
groups.size()=" + groups.size() +
- "; criteria.hash()=" + criteria.hashCode());
+ "; criteria.hash()=" + criteria.hashCode() + ";namespace=" +
ns);
}
return groups;
@@ -429,7 +430,7 @@
getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns),
NODE_GROUPS_SEARCHES));
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating Groups cache. Namespace:" +
ns);
+ log.finer(this.toString() + "Invalidating Groups cache. Namespace:" +
ns + ";namespace=" + ns);
}
}
@@ -443,7 +444,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Group count stored in cache: type=" +
groupType + "; count=" + count);
+ log.finer(this.toString() + "Group count stored in cache: type=" +
groupType + "; count=" + count
+ + ";namespace=" + ns);
}
}
@@ -464,7 +466,8 @@
if (log.isLoggable(Level.FINER) && count != -1)
{
- log.finer(this.toString() + "Group count found in cache:
groupType=" + groupType + "; count=" + count);
+ log.finer(this.toString() + "Group count found in cache:
groupType=" + groupType + "; count=" + count
+ + ";namespace=" + ns);
}
return count;
@@ -493,7 +496,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Role stored in cache: " + role);
+ log.finer(this.toString() + "Role stored in cache: " + role +
";namespace=" + ns);
}
}
@@ -509,7 +512,7 @@
if (log.isLoggable(Level.FINER) && result != null)
{
- log.finer(this.toString() + "Role found in cache: id=" + result);
+ log.finer(this.toString() + "Role found in cache: id=" + result +
";namespace=" + ns);
}
return result;
@@ -534,7 +537,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "RoleType stored in cache: name=" +
role.getName());
+ log.finer(this.toString() + "RoleType stored in cache: name=" +
role.getName() + ";namespace=" + ns);
}
}
@@ -550,7 +553,7 @@
if (log.isLoggable(Level.FINER) && result != null)
{
- log.finer(this.toString() + "RoleType found in cache: name=" +
role.getName());
+ log.finer(this.toString() + "RoleType found in cache: name=" +
role.getName() + ";namespace=" + ns);
}
return result;
@@ -574,7 +577,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Attributes stored in cache: id=" + id +
"; attributes.size()=" + attributes.size());
+ log.finer(this.toString() + "Attributes stored in cache: id=" + id +
"; attributes.size()="
+ + attributes.size() + ";namespace=" + ns);
}
}
@@ -591,7 +595,7 @@
if (log.isLoggable(Level.FINER) && attributes != null)
{
log.finer(this.toString() + "Attributes search found in cache:
attributes.size()=" + attributes.size() +
- "; id=" + id);
+ "; id=" + id + ";namespace=" + ns);
}
return attributes;
@@ -628,7 +632,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Role properties stored in cache: role=" +
role + "; properties.size()=" + properties.size());
+ log.finer(this.toString() + "Role properties stored in cache: role=" +
role + "; properties.size()="
+ + properties.size() + ";namespace=" + ns);
}
}
@@ -645,7 +650,7 @@
if (log.isLoggable(Level.FINER) && props != null)
{
log.finer(this.toString() + "Role properties found in cache:
properties.size()=" + props.size() +
- "; role=" + role);
+ "; role=" + role + ";namespace=" + ns);
}
return props;
@@ -682,7 +687,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "RoleType properties stored in cache:
roleType=" + roleType + "; properties.size()=" + properties.size());
+ log.finer(this.toString() + "RoleType properties stored in cache:
roleType=" + roleType
+ + "; properties.size()=" + properties.size() +
";namespace=" + ns);
}
}
@@ -699,7 +705,7 @@
if (log.isLoggable(Level.FINER) && props != null)
{
log.finer(this.toString() + "RoleType properties found in cache:
properties.size()=" + props.size() +
- "; roleType=" + roleType);
+ "; roleType=" + roleType + ";namespace=" + ns);
}
return props;
@@ -749,7 +755,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "User search stored in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "User search stored in cache:
results.size()=" + results.size()
+ + ";namespace=" + ns);
}
}
@@ -765,7 +772,8 @@
if (log.isLoggable(Level.FINER) && props != null)
{
- log.finer(this.toString() + "User search found in cache:
properties.size()=" + props.size());
+ log.finer(this.toString() + "User search found in cache:
properties.size()=" + props.size()
+ + ";namespace=" + ns);
}
return props;
@@ -784,7 +792,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Group search stored in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "Group search stored in cache:
results.size()=" + results.size() + ";namespace=" + ns);
}
}
@@ -800,7 +808,7 @@
if (log.isLoggable(Level.FINER) && results != null)
{
- log.finer(this.toString() + "Group search found in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "Group search found in cache:
results.size()=" + results.size() + ";namespace=" + ns);
}
return results;
@@ -819,7 +827,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Relationship search stored in cache:
result=" + result);
+ log.finer(this.toString() + "Relationship search stored in cache:
result=" + result + ";namespace=" + ns);
}
}
@@ -835,7 +843,7 @@
if (log.isLoggable(Level.FINER) && result != null)
{
- log.finer(this.toString() + "Relationship search found in cache:
properties.size()=" + result);
+ log.finer(this.toString() + "Relationship search found in cache:
properties.size()=" + result + ";namespace=" + ns);
}
return result;
@@ -854,7 +862,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Role search stored in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "Role search stored in cache:
results.size()=" + results.size() + ";namespace=" + ns);
}
}
@@ -870,7 +878,7 @@
if (log.isLoggable(Level.FINER) && results != null)
{
- log.finer(this.toString() + "Role search found in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "Role search found in cache:
results.size()=" + results.size() + ";namespace=" + ns);
}
return results;
@@ -889,7 +897,7 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "RoleType search stored in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "RoleType search stored in cache:
results.size()=" + results.size() + ";namespace=" + ns);
}
}
@@ -905,7 +913,7 @@
if (log.isLoggable(Level.FINER) && results != null)
{
- log.finer(this.toString() + "RoleType search found in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "RoleType search found in cache:
results.size()=" + results.size() + ";namespace=" + ns);
}
return results;
@@ -936,7 +944,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "User query stored in cache:
q.hashCode()=" + q.hashCode() + "; results.size()=" + results.size());
+ log.finer(this.toString() + "User query stored in cache:
q.hashCode()=" + q.hashCode()
+ + "; results.size()=" + results.size() + ";namespace=" +
ns);
}
}
@@ -950,7 +959,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "User query stored in cache:
q.hashCode()=" + q.hashCode() + "; user=" + user);
+ log.finer(this.toString() + "User query stored in cache:
q.hashCode()=" + q.hashCode() + "; user=" + user
+ + ";namespace=" + ns);
}
}
@@ -967,7 +977,7 @@
if (log.isLoggable(Level.FINER) && users != null)
{
log.finer(this.toString() + "User query found in cache:
users.size()=" + users.size() +
- "; query.hash()=" + q.hashCode());
+ "; query.hash()=" + q.hashCode() + ";namespace=" +
ns);
}
return users;
@@ -988,7 +998,7 @@
if (log.isLoggable(Level.FINER) && users != null)
{
- log.finer(this.toString() + "User query found in cache: user=" +
users);
+ log.finer(this.toString() + "User query found in cache: user=" +
users + ";namespace=" + ns);
}
return users;
@@ -1016,7 +1026,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Group query stored in cache:
q.hashCode()=" + q.hashCode() + "; results.size()=" + results.size());
+ log.finer(this.toString() + "Group query stored in cache:
q.hashCode()=" + q.hashCode()
+ + "; results.size()=" + results.size() + ";namespace=" +
ns);
}
}
@@ -1030,7 +1041,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Group query stored in cache:
q.hashCode()=" + q.hashCode() + "; group=" + group);
+ log.finer(this.toString() + "Group query stored in cache:
q.hashCode()=" + q.hashCode()
+ + "; group=" + group + ";namespace=" + ns);
}
}
@@ -1047,7 +1059,7 @@
if (log.isLoggable(Level.FINER) && groups != null)
{
log.finer(this.toString() + "Group query found in cache:
groups.size()=" + groups.size() +
- "; query.hash()=" + q.hashCode());
+ "; query.hash()=" + q.hashCode() + ";namespace=" +
ns);
}
return groups;
@@ -1068,7 +1080,7 @@
if (log.isLoggable(Level.FINER) && group != null)
{
- log.finer(this.toString() + "Group query found in cache: group=" +
group);
+ log.finer(this.toString() + "Group query found in cache: group=" +
group + ";namespace=" + ns);
}
return group;
@@ -1096,7 +1108,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Role query stored in cache:
q.hashCode()=" + q.hashCode() + "; results.size()=" + results.size());
+ log.finer(this.toString() + "Role query stored in cache:
q.hashCode()=" + q.hashCode()
+ + "; results.size()=" + results.size() + ";namespace=" +
ns);
}
}
public void putRoleQueryUnique(String ns, RoleQuery q, Role role)
@@ -1109,7 +1122,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Role query stored in cache:
q.hashCode()=" + q.hashCode() + "; role=" + role);
+ log.finer(this.toString() + "Role query stored in cache:
q.hashCode()=" + q.hashCode() + "; role=" + role
+ + ";namespace=" + ns);
}
}
@@ -1126,7 +1140,7 @@
if (log.isLoggable(Level.FINER) && roles != null)
{
log.finer(this.toString() + "Role query found in cache:
users.size()=" + roles.size() +
- "; query.hash()=" + q.hashCode());
+ "; query.hash()=" + q.hashCode() + ";namespace=" +
ns);
}
return roles;
@@ -1147,7 +1161,7 @@
if (log.isLoggable(Level.FINER) && role != null)
{
- log.finer(this.toString() + "Role query found in cache: role=" +
role);
+ log.finer(this.toString() + "Role query found in cache: role=" +
role + ";namespace=" + ns);
}
return role;
Modified:
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java
===================================================================
---
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java 2009-11-11
22:03:01 UTC (rev 926)
+++
idm/trunk/idm-cache/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreCacheProviderImpl.java 2009-11-11
22:20:53 UTC (rev 927)
@@ -186,7 +186,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "IdentityObject count stored in cache: " +
count + "; type=" + type);
+ log.finer(this.toString() + "IdentityObject count stored in cache: " +
count + "; type=" + type
+ + ";namespace=" + ns);
}
}
@@ -207,7 +208,8 @@
if (log.isLoggable(Level.FINER) && count != -1)
{
- log.finer(this.toString() + "IdentityObject count found in cache: "
+ count + "; type=" + type);
+ log.finer(this.toString() + "IdentityObject count found in cache: "
+ count + "; type=" + type
+ + ";namespace=" + ns);
}
return count;
@@ -221,7 +223,8 @@
getCache().getRoot().removeChild(Fqn.fromElements(getNamespacedFqn(ns),
NODE_IO_COUNT, type));
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating IdentityObject count.
Namespace:" + ns + "; type=" + type);
+ log.finer(this.toString() + "Invalidating IdentityObject count.
Namespace:" + ns + "; type=" + type
+ + ";namespace=" + ns);
}
}
@@ -235,7 +238,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "IdentityObject search stored in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "IdentityObject search stored in cache:
results.size()=" + results.size()
+ + ";namespace=" + ns);
}
}
@@ -251,7 +255,8 @@
if (log.isLoggable(Level.FINER) && results != null)
{
- log.finer(this.toString() + "IdentityObject search found in cache:
results.size()=" + results.size());
+ log.finer(this.toString() + "IdentityObject search found in cache:
results.size()=" + results.size()
+ + ";namespace=" + ns);
}
return results;
@@ -279,7 +284,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "IdentityObjectRelationship search stored in
cache: results.size()=" + results.size());
+ log.finer(this.toString() + "IdentityObjectRelationship search stored in
cache: results.size()=" + results.size()
+ + ";namespace=" + ns);
}
}
@@ -295,7 +301,8 @@
if (log.isLoggable(Level.FINER) && results != null)
{
- log.finer(this.toString() + "IdentityObjectRelationship search found in
cache: results.size()=" + results.size());
+ log.finer(this.toString() + "IdentityObjectRelationship search found in
cache: results.size()=" + results.size()
+ + ";namespace=" + ns);
}
return results;
@@ -323,7 +330,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "IdentityObjectRelationshipName search stored
in cache: results.size()=" + results.size());
+ log.finer(this.toString() + "IdentityObjectRelationshipName search stored
in cache: results.size()=" + results.size()
+ + ";namespace=" + ns);
}
}
@@ -339,7 +347,8 @@
if (log.isLoggable(Level.FINER) && results != null)
{
- log.finer(this.toString() + "IdentityObjectRelationshipName search found
in cache: results.size()=" + results.size());
+ log.finer(this.toString() + "IdentityObjectRelationshipName search found
in cache: results.size()=" + results.size()
+ + ";namespace=" + ns);
}
return results;
@@ -367,7 +376,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "IdentityObjectRelationship properties stored
in cache: relationship=" + relationship + "; properties.size()=" +
properties.size());
+ log.finer(this.toString() + "IdentityObjectRelationship properties stored
in cache: relationship="
+ + relationship + "; properties.size()=" + properties.size() +
";namespace=" + ns);
}
}
@@ -393,7 +403,7 @@
if (log.isLoggable(Level.FINER) && props != null)
{
log.finer(this.toString() + "IdentityObjectRelationship properties found
in cache: properties.size()=" + props.size() +
- "; relationship=" + relationship);
+ "; relationship=" + relationship + ";namespace=" + ns);
}
return props;
@@ -407,7 +417,8 @@
getCache().getRoot().removeChild(getFqn(ns, NODE_REL_PROPS,
decode(relationship)));
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating IdentityObjectRelationship
properties. Namespace:" + ns + "; relationship=" + relationship);
+ log.finer(this.toString() + "Invalidating IdentityObjectRelationship
properties. Namespace:" + ns
+ + "; relationship=" + relationship + ";namespace=" +
ns);
}
}
@@ -430,7 +441,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "IdentityObjectRelationshipName properties
stored in cache: name=" + name + "; properties.size()=" +
properties.size());
+ log.finer(this.toString() + "IdentityObjectRelationshipName properties
stored in cache: name="
+ + name + "; properties.size()=" + properties.size() +
";namespace=" + ns);
}
}
@@ -447,7 +459,7 @@
if (log.isLoggable(Level.FINER) && props != null)
{
log.finer(this.toString() + "IdentityObjectRelationshipName properties
found in cache: properties.size()=" + props.size() +
- "; name=" + name);
+ "; name=" + name + ";namespace=" + ns);
}
return props;
@@ -461,7 +473,8 @@
getCache().getRoot().removeChild(getFqn(ns, NODE_REL_NAME_PROPS, relationship));
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating IdentityObjectRelationshipName
properties. Namespace:" + ns + "; name=" + relationship);
+ log.finer(this.toString() + "Invalidating IdentityObjectRelationshipName
properties." +
+ " Namespace:" + ns + "; name=" + relationship);
}
}
@@ -470,7 +483,8 @@
getCache().getRoot().removeChild(getFqn(ns, NODE_REL_NAME_PROPS));
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "Invalidating IdentityObjectRelationshipName
properties. Namespace:" + ns);
+ log.finer(this.toString() + "Invalidating IdentityObjectRelationshipName
properties. " +
+ "Namespace:" + ns);
}
}
@@ -485,7 +499,8 @@
if (log.isLoggable(Level.FINER))
{
- log.finer(this.toString() + "IdentityObject attributes stored in cache:
io=" + io + "; attributes.size()=" + attributes.size());
+ log.finer(this.toString() + "IdentityObject attributes stored in cache:
io=" + io
+ + "; attributes.size()=" + attributes.size() +
";namespace=" + ns);
}
}
@@ -502,7 +517,7 @@
if (log.isLoggable(Level.FINER) && props != null)
{
log.finer(this.toString() + "IIdentityObject attributes found in cache:
attributes.size()=" + props.size() +
- "; io=" + io);
+ "; io=" + io + ";namespace=" + ns);
}
return props;