You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2016/07/14 12:26:32 UTC

incubator-unomi git commit: UNOMI-43 Improve context and event servlet logging

Repository: incubator-unomi
Updated Branches:
  refs/heads/master 91ec0c546 -> ff9100120


UNOMI-43 Improve context and event servlet logging

Add more server-side logging to context and event collector servlets.


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/ff910012
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/ff910012
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/ff910012

Branch: refs/heads/master
Commit: ff9100120b87a109732bbddb67ffe19bb00e3d53
Parents: 91ec0c5
Author: Serge Huber <sh...@apache.org>
Authored: Thu Jul 14 14:26:27 2016 +0200
Committer: Serge Huber <sh...@apache.org>
Committed: Thu Jul 14 14:26:27 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/unomi/web/ContextServlet.java |  7 ++++++-
 .../org/apache/unomi/web/EventsCollectorServlet.java   | 13 +++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ff910012/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
index d45f263..0c1bc8e 100644
--- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
@@ -23,7 +23,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.unomi.api.*;
 import org.apache.unomi.api.conditions.Condition;
 import org.apache.unomi.api.services.EventService;
-import org.apache.unomi.api.services.PrivacyService;
+import org.apache.unomi.api.privacy.PrivacyService;
 import org.apache.unomi.api.services.ProfileService;
 import org.apache.unomi.api.services.RulesService;
 import org.apache.unomi.persistence.spi.CustomObjectMapper;
@@ -79,6 +79,7 @@ public class ContextServlet extends HttpServlet {
 
         if ("options".equals(httpMethod.toLowerCase())) {
             response.flushBuffer();
+            logger.debug("OPTIONS request received. No context will be returned.");
             return;
         }
 
@@ -110,6 +111,10 @@ public class ContextServlet extends HttpServlet {
 
         if (cookieProfileId == null && sessionId == null && personaId == null) {
             ((HttpServletResponse)response).sendError(HttpServletResponse.SC_BAD_REQUEST);
+            logger.error("Couldn't find cookieProfileId, sessionId or personaId in incoming request! Stopped processing request. See debug level for more information");
+            if (logger.isDebugEnabled()) {
+                logger.debug("Request dump:" + HttpUtils.dumpRequestInfo(httpServletRequest));
+            }
             return;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ff910012/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
----------------------------------------------------------------------
diff --git a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
index 5e7f608..fab68f2 100644
--- a/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/EventsCollectorServlet.java
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.unomi.api.*;
 import org.apache.unomi.api.services.EventService;
-import org.apache.unomi.api.services.PrivacyService;
+import org.apache.unomi.api.privacy.PrivacyService;
 import org.apache.unomi.api.services.ProfileService;
 import org.apache.unomi.persistence.spi.CustomObjectMapper;
 import org.slf4j.Logger;
@@ -78,26 +78,34 @@ public class EventsCollectorServlet extends HttpServlet {
 
         String sessionId = request.getParameter("sessionId");
         if (sessionId == null) {
+            logger.error("No sessionId found in incoming request, aborting processing. See debug level for more information");
+            if (logger.isDebugEnabled()) {
+                logger.debug("Request dump:" + HttpUtils.dumpRequestInfo(request));
+            }
             return;
         }
 
         Session session = profileService.loadSession(sessionId, timestamp);
         if (session == null) {
+            logger.error("No session found for sessionId={}, aborting request !", sessionId);
             return;
         }
 
         String profileId = session.getProfileId();
         if (profileId == null) {
+            logger.error("No profileId found in session={}, aborting request !", session.getItemId());
             return;
         }
 
         profile = profileService.load(profileId);
         if (profile == null || profile instanceof Persona) {
+            logger.error("No valid profile found or persona found for profileId={}, aborting request !", profileId);
             return;
         }
 
         String payload = HttpUtils.getPayload(request);
-        if(payload == null){
+        if (payload == null){
+            logger.error("No event payload found for request, aborting !", profileId);
             return;
         }
 
@@ -111,6 +119,7 @@ public class EventsCollectorServlet extends HttpServlet {
             return;
         }
         if (events == null || events.getEvents() == null) {
+            logger.error("No events found in payload");
             return;
         }