java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 2
java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java | 22 +++++-----
2 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 3e6c2a40cb9f99743c733ffab1e943c9bd3fda26
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jul 28 17:14:04 2010 -0400
563797 - changing behavior of lookup exceptions to print a smaller error as well as
not send an email by default
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index 7918b1d..9259c2a 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -157,6 +157,8 @@ public class ConfigDefaults {
public static final String DB_BACKEND = "db_backend";
public static final String DB_BACKEND_ORACLE = "oracle";
+ public static final String LOOKUP_EXCEPT_SEND_EMAIL =
"lookup_exception_email";
+
private ConfigDefaults() {
}
diff --git a/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java
b/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java
index b74b2e6..ff48c07 100644
--- a/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java
+++ b/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java
@@ -14,6 +14,8 @@
*/
package com.redhat.rhn.common.errors;
+import com.redhat.rhn.common.conf.Config;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.hibernate.LookupException;
import com.redhat.rhn.common.messaging.MessageQueue;
import com.redhat.rhn.domain.user.User;
@@ -40,21 +42,23 @@ public class LookupExceptionHandler extends ExceptionHandler {
*/
protected void logException(Exception ex) {
Logger log = Logger.getLogger(LookupExceptionHandler.class);
- log.error("Hibernate LookupException", ex);
exception = (LookupException) ex;
+ log.warn(exception.getMessage());
}
protected void storeException(HttpServletRequest request, String property,
ActionMessage msg, ActionForward forward, String scope)
{
- TraceBackEvent evt = new TraceBackEvent();
- RequestContext requestContext = new RequestContext(request);
- User usr = requestContext.getLoggedInUser();
- evt.setUser(usr);
- evt.setRequest(request);
- evt.setException(exception);
- MessageQueue.publish(evt);
-
+ if (Config.get().getBoolean(ConfigDefaults.LOOKUP_EXCEPT_SEND_EMAIL)) {
+ TraceBackEvent evt = new TraceBackEvent();
+ RequestContext requestContext = new RequestContext(request);
+ User usr = requestContext.getLoggedInUser();
+ evt.setUser(usr);
+ evt.setRequest(request);
+ evt.setException(exception);
+ MessageQueue.publish(evt);
+ }
request.setAttribute("error", exception);
+
}
}
Show replies by date