Revision: 29335
Author: wko
Date: 2011-08-05 04:05:16 +0200 (Fri, 05 Aug 2011)
Log Message:
-----------
HSTTWO-1714: Showing the component location when exception occurred even at
WARN or higher level
Modified Paths:
--------------
hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentInvokerImpl.java
Modified:
hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentInvokerImpl.java
===================================================================
---
hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentInvokerImpl.java
2011-08-04 21:05:04 UTC (rev 29334)
+++
hippo-cms7/site-toolkit/trunk/components/core/src/main/java/org/hippoecm/hst/core/container/HstComponentInvokerImpl.java
2011-08-05 02:05:16 UTC (rev 29335)
@@ -90,9 +90,9 @@
window.addComponentExcpetion(e);
if (log.isDebugEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e.toString(), e);
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ":
{}", e.toString());
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": {}
at {}", e, getFirstStackTraceElement(e));
}
} catch (Exception e) {
if (this.exceptionThrowable) {
@@ -102,9 +102,9 @@
window.addComponentExcpetion(new HstComponentException(e));
if (log.isDebugEnabled()) {
- log.warn("Component exception caught: " + e.toString(), e);
+ log.warn("Component exception caught: " + e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught: {}", e.toString());
+ log.warn("Component exception caught: {} at {}", e,
getFirstStackTraceElement(e));
}
} finally {
if (currentClassloader != null) {
@@ -139,9 +139,9 @@
window.addComponentExcpetion(e);
if (log.isDebugEnabled()) {
- log.warn("Component exception caught: " + e.toString(), e);
+ log.warn("Component exception caught: " + e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught: {}", e.toString());
+ log.warn("Component exception caught: {} at {}", e,
getFirstStackTraceElement(e));
}
} catch (Exception e) {
if (this.exceptionThrowable) {
@@ -151,9 +151,9 @@
window.addComponentExcpetion(new HstComponentException(e));
if (log.isDebugEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e.toString(), e);
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ":
{}", e.toString());
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": {}
at {}", e, getFirstStackTraceElement(e));
}
} finally {
if (currentClassloader != null) {
@@ -216,9 +216,9 @@
window.addComponentExcpetion(e);
if (log.isDebugEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e.toString(), e);
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ":
{}", e.toString());
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": {}
at {}", e, getFirstStackTraceElement(e));
}
} catch (Exception e) {
if (this.exceptionThrowable) {
@@ -228,9 +228,9 @@
window.addComponentExcpetion(new HstComponentException(e));
if (log.isDebugEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e.toString(), e);
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ":
{}", e.toString());
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": {}
at {}", e, getFirstStackTraceElement(e));
}
} finally {
removeHstObjectAttributesForServlet(wrappedRequest, hstRequest,
hstResponse);
@@ -260,9 +260,9 @@
window.addComponentExcpetion(e);
if (log.isDebugEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e.toString(), e);
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ":
{}", e.toString());
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": {}
at {}", e, getFirstStackTraceElement(e));
}
} catch (Exception e) {
if (this.exceptionThrowable) {
@@ -272,9 +272,9 @@
window.addComponentExcpetion(new HstComponentException(e));
if (log.isDebugEnabled()) {
- log.warn("Component exception caught: " + e.toString(), e);
+ log.warn("Component exception caught: " + e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught: {}", e.toString());
+ log.warn("Component exception caught: {} at {}", e,
getFirstStackTraceElement(e));
}
} finally {
if (currentClassloader != null) {
@@ -327,9 +327,9 @@
window.addComponentExcpetion(e);
if (log.isDebugEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e.toString(), e);
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": " +
e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ":
{}", e.toString());
+ log.warn("Component exception caught on window " +
window.getName() + " with component " + component.getClass().getName() + ": {}
at {}", e, getFirstStackTraceElement(e));
}
} catch (Exception e) {
if (this.exceptionThrowable) {
@@ -339,9 +339,9 @@
window.addComponentExcpetion(new HstComponentException(e));
if (log.isDebugEnabled()) {
- log.warn("Component exception caught: " + e.toString(), e);
+ log.warn("Component exception caught: " + e, e);
} else if (log.isWarnEnabled()) {
- log.warn("Component exception caught: {}", e.toString());
+ log.warn("Component exception caught: {} at {}", e,
getFirstStackTraceElement(e));
}
} finally {
removeHstObjectAttributesForServlet(wrappedRequest, hstRequest,
hstResponse);
@@ -459,4 +459,13 @@
servletRequest.removeAttribute(ContainerConstants.HST_RESPONSE);
}
+ private StackTraceElement getFirstStackTraceElement(final Throwable th) {
+ StackTraceElement [] stackTraceElements = th.getStackTrace();
+
+ if (stackTraceElements != null && stackTraceElements.length != 0) {
+ return stackTraceElements[0];
+ }
+
+ return null;
+ }
}
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.hippocms.org
http://lists.hippo.nl/mailman/listinfo/hippocms-svn
