Author: ssmiweve
Date: 2008-10-09 12:08:24 +0200 (Thu, 09 Oct 2008)
New Revision: 6867
Modified:
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
Log:
Issue SKER5012: (IP info missing in hunting boomerang logging for Sesam.se
skins)
Modified:
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
===================================================================
---
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
2008-10-08 10:13:48 UTC (rev 6866)
+++
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
2008-10-09 10:08:24 UTC (rev 6867)
@@ -79,6 +79,17 @@
res.setHeader("Pragma", "no-cache"); // for old browsers
res.setDateHeader("Expires", 0); // to be double-safe
+ // entrails is the map of logging information
+ final Map<String,Object> entrails = new HashMap<String,Object>();
+
+ // request attribute to keep
+ entrails.put("referer", req.getHeader("Referer"));
+ entrails.put("method", req.getMethod());
+ entrails.put("ipaddress", req.getRemoteAddr());
+ entrails.put("user-agent", req.getHeader("User-Agent"));
+ entrails.put("user-id", SearchServlet.getCookieValue(req, "SesamID"));
+ entrails.put("user", SearchServlet.getCookieValue(req, "SesamUser"));
+
if(req.getRequestURI().startsWith(CEREMONIAL)){
// ceremonial boomerang
@@ -98,16 +109,6 @@
final String destination = url.substring(
url.indexOf("/", url.indexOf(CEREMONIAL) +
CEREMONIAL.length() + 1) + 1);
- final Map<String,String> entrails = new
HashMap<String,String>();
-
- // request attribute to keep
- entrails.put("referer", req.getHeader("Referer"));
- entrails.put("method", req.getMethod());
- entrails.put("ipaddress", req.getRemoteAddr());
- entrails.put("user-agent", req.getHeader("User-Agent"));
- entrails.put("user-id", SearchServlet.getCookieValue(req,
"SesamID"));
- entrails.put("user", SearchServlet.getCookieValue(req,
"SesamUser"));
-
// the grub details to add
if(0 < grub.length()){
final StringTokenizer tokeniser = new
StringTokenizer(grub, ";");
@@ -142,7 +143,8 @@
// hunting boomerang, just grub, and the grub comes as clean
parameters.
final DataModel datamodel = (DataModel)
req.getSession().getAttribute(DataModel.KEY);
- kangerooGrub(datamodel.getParameters().getValues());
+ entrails.putAll(datamodel.getParameters().getValues());
+ kangerooGrub(entrails);
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
