From 15ea914fd77351a156cebe66b3ff1bf21c575470 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 3 Jul 2012 08:14:05 +0000
Subject: [PATCH] [SOB=81] Log a "Session expired" exception as a warning
rather than an error.
SVN: 25980
---
.../cisd/common/servlet/GWTRPCServiceExporter.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/servlet/GWTRPCServiceExporter.java b/common/source/java/ch/systemsx/cisd/common/servlet/GWTRPCServiceExporter.java
index 73e66ee791b..286ef1a150d 100644
--- a/common/source/java/ch/systemsx/cisd/common/servlet/GWTRPCServiceExporter.java
+++ b/common/source/java/ch/systemsx/cisd/common/servlet/GWTRPCServiceExporter.java
@@ -22,6 +22,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.DisposableBean;
@@ -56,6 +57,8 @@ import ch.systemsx.cisd.common.utilities.MethodUtils;
public abstract class GWTRPCServiceExporter extends RemoteServiceServlet implements
InitializingBean, ServletConfigAware, DisposableBean, BeanNameAware, Controller
{
+ private static final String SESSION_EXP_MSG = "Session expired. Please login again.";
+
private static final long serialVersionUID = 1L;
private static final Logger operationLog =
@@ -142,12 +145,13 @@ public abstract class GWTRPCServiceExporter extends RemoteServiceServlet impleme
final String methodDescription =
String.format("Invoking method '%s' failed.", targetMethod == null ? "<unknown>"
: MethodUtils.describeMethod(targetMethod));
+ final Level level = SESSION_EXP_MSG.equals(cause.getMessage()) ? Level.WARN : Level.ERROR;
if (cause instanceof IOptionalStackTraceLoggingException)
{
- operationLog.error(methodDescription + ": " + cause.getMessage());
+ operationLog.log(level, methodDescription + ": " + cause.getMessage());
} else
{
- operationLog.error(methodDescription, cause);
+ operationLog.log(level, methodDescription, cause);
}
}
--
GitLab