[jboss-cvs] JBossAS SVN: r99614 - projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 19 16:01:48 EST 2010
Author: bstansberry at jboss.com
Date: 2010-01-19 16:01:47 -0500 (Tue, 19 Jan 2010)
New Revision: 99614
Modified:
projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AttributeBasedJBossCacheService.java
projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java
projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java
Log:
[JBCLUSTER-248] Improve logging
Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java 2010-01-19 20:57:19 UTC (rev 99613)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AbstractJBossCacheService.java 2010-01-19 21:01:47 UTC (rev 99614)
@@ -373,7 +373,10 @@
}
catch (Exception e)
{
- log_.warn("Problem accessing session data : " + e.getClass() + " " + e.getLocalizedMessage());
+ String masked = Util.maskId(realId);
+ log_.warn("Problem accessing session data for session " + masked + " (" +
+ e.getClass().getName() + ") -- existing session cannot be used");
+ log_.debug("Details on problem accessing session data for " + masked, e);
// Clean up
removeSessionLocal(realId);
return null;
@@ -388,7 +391,7 @@
if (log_.isTraceEnabled())
{
- log_.trace("putSession(): putting session " + realId);
+ log_.trace("putSession(): putting session " + Util.maskId(realId));
}
Fqn<String> fqn = getSessionFqn(combinedPath_, realId);
@@ -486,7 +489,8 @@
Fqn<String> fqn = getSessionFqn(combinedPath_, realId);
if (log_.isTraceEnabled())
{
- log_.trace("Remove session from distributed store. Fqn: " + fqn);
+ log_.trace("Remove session " + Util.maskId(realId) + " from " +
+ "distributed store. Parent Fqn: " + fqn.getParent());
}
cacheWrapper_.remove(fqn);
@@ -499,7 +503,8 @@
Fqn<String> fqn = getSessionFqn(combinedPath_, realId);
if (log_.isTraceEnabled())
{
- log_.trace("Remove session from my own distributed store only. Fqn: " + fqn);
+ log_.trace("Removing session " + Util.maskId(realId) + " from my " +
+ "own distributed store only. Parent Fqn: " + fqn.getParent());
}
cacheWrapper_.removeLocal(fqn);
@@ -520,7 +525,8 @@
{
if (log_.isTraceEnabled())
{
- log_.trace("Remove session from my own distributed store only. Fqn: " + fqn);
+ log_.trace("Removing session " + Util.maskId(realId) + " from my " +
+ "own distributed store only. Parent Fqn: " + fqn.getParent());
}
cacheWrapper_.removeLocal(fqn);
}
@@ -532,7 +538,8 @@
Fqn<String> fqn = getSessionFqn(combinedPath_, realId);
if(log_.isTraceEnabled())
{
- log_.trace("evictSession(): evicting session from my distributed store. Fqn: " + fqn);
+ log_.trace("evictSession(): evicting session " + Util.maskId(realId) +
+ " from distributed store. Parent Fqn: " + fqn.getParent());
}
cacheWrapper_.evictSubtree(fqn);
}
@@ -550,7 +557,8 @@
{
if(log_.isTraceEnabled())
{
- log_.trace("evictSession(): evicting session from my distributed store. Fqn: " + fqn);
+ log_.trace("evictSession(): evicting session " + Util.maskId(realId) +
+ " from distributed store. Parent Fqn: " + fqn.getParent());
}
cacheWrapper_.evictSubtree(fqn);
}
@@ -796,7 +804,9 @@
}
catch (CacheException e)
{
- log_.error("can't clean content from the underlying distributed cache");
+ String msg = e.getLocalizedMessage();
+ log_.error("Can't clean content from the underlying distributed cache -- " +
+ e.getClass().getName() + (msg == null ? "" : " " + msg));
}
}
Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AttributeBasedJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AttributeBasedJBossCacheService.java 2010-01-19 20:57:19 UTC (rev 99613)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/AttributeBasedJBossCacheService.java 2010-01-19 21:01:47 UTC (rev 99614)
@@ -85,7 +85,9 @@
Fqn<String> fqn = getSessionFqn(combinedPath_, realId);
if (log_.isTraceEnabled())
{
- log_.trace("Remove attribute from distributed store. Fqn: " + fqn + " key: " + key);
+ log_.trace("Removing attribute from distributed store for session " +
+ Util.maskId(realId) +". Parent Fqn: " + fqn.getParent() +
+ " key: " + key);
}
return unmarshall(realId, key, cacheWrapper_.remove(fqn, key));
}
@@ -95,7 +97,9 @@
Fqn<String> fqn = getSessionFqn(combinedPath_, realId);
if (log_.isTraceEnabled())
{
- log_.trace("Remove attribute from distributed store. Fqn: " + fqn + " key: " + key);
+ log_.trace("Removing attribute from my own distributed store only for session " +
+ Util.maskId(realId) +". Parent Fqn: " + fqn.getParent() +
+ " key: " + key);
}
cacheWrapper_.removeLocal(fqn, key);
}
@@ -120,7 +124,7 @@
}
catch (CacheException e)
{
- log_.error("getAttributeKeys(): Exception getting keys for session " + realId, e);
+ log_.error("getAttributeKeys(): Exception getting keys for session " + Util.maskId(realId), e);
}
return keys;
Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java 2010-01-19 20:57:19 UTC (rev 99613)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/CacheListener.java 2010-01-19 21:01:47 UTC (rev 99614)
@@ -132,7 +132,9 @@
Long timestamp = (Long) data.get(AbstractJBossCacheService.TIMESTAMP_KEY);
if (timestamp == null)
{
- log_.warn("No timestamp attribute found in " + fqn);
+ log_.warn("No timestamp attribute found in node modification " +
+ "event data for session " + Util.maskId(realId) +
+ " under parent fqn " + fqn.getParent());
}
else
{
Modified: projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java
===================================================================
--- projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java 2010-01-19 20:57:19 UTC (rev 99613)
+++ projects/cluster/ha-server-cache-jbc/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/impl/jbc/FieldBasedJBossCacheService.java 2010-01-19 21:01:47 UTC (rev 99614)
@@ -101,17 +101,19 @@
{
if(log_.isTraceEnabled())
{
- log_.trace("putAttribute(): session id: " + realId + " key: " + key +
+ log_.trace("putAttribute(): session id: " + Util.maskId(realId) + " key: " + key +
" object: " + value.toString());
}
Fqn<String> fqn = getFieldFqn(combinedPath_, realId, key);
- try {
+ try
+ {
pojoCache_.attach(fqn.toString(), value);
}
catch (CacheException e)
{
- throw new RuntimeException("Exception occurred in PojoCache attach ... ", e);
+ throw new RuntimeException("Exception occurred in PojoCache attach " +
+ "for session + " + Util.maskId(realId) + " key" + key, e);
}
}
@@ -125,7 +127,7 @@
{
if(log_.isTraceEnabled())
{
- log_.trace("removePojo(): session id: " +realId + " key: " +key);
+ log_.trace("removeAttribute(): session id: " + Util.maskId(realId) + " key: " +key);
}
// Construct the fqn.
Fqn<String> fqn = getFieldFqn(combinedPath_, realId, key);
@@ -142,7 +144,7 @@
{
if(log_.isTraceEnabled())
{
- log_.trace("removePojoLocal(): session id: " + realId + " key: " +key);
+ log_.trace("removeAttributeLocal(): session id: " + Util.maskId(realId) + " key: " +key);
}
Fqn<String> fqn = getFieldFqn(combinedPath_, realId, key);
@@ -159,7 +161,7 @@
}
catch (CacheException e)
{
- log_.error("getAttributeKeys(): Exception getting keys for session " + realId, e);
+ log_.error("getAttributeKeys(): Exception getting keys for session " + Util.maskId(realId), e);
}
return keys;
@@ -177,8 +179,8 @@
Fqn<String> fqn = getFieldFqn(combinedPath_, realId, key);
if(log_.isTraceEnabled())
{
- log_.trace("getPojo(): session id: " +realId + " key: " + key +
- " fqn: " + fqn);
+ log_.trace("getAttribute(): session id: " + Util.maskId(realId) + " key: " + key +
+ " parent fqn: " + fqn.getParent());
}
try
@@ -240,7 +242,8 @@
getCache().getRegion(fqn, true);
if (log_.isTraceEnabled())
{
- log_.trace("Created region for session at " + fqn);
+ String id = Util.maskId(fqn.getLastElementAsString());
+ log_.trace("Created region for session " + id + " under parent fqn " + fqn.getParent());
}
}
@@ -250,7 +253,8 @@
getCache().removeRegion(fqn);
if (log_.isTraceEnabled())
{
- log_.trace("Removed region for session at " + fqn);
+ log_.trace("Removed region for session + " + Util.maskId(realId) +
+ " under parent fqn " + fqn.getParent());
}
}
More information about the jboss-cvs-commits
mailing list