# HG changeset patch
# User casties
# Date 1423075022 -3600
# Node ID 247cbbb385ded777ef2801729617a23fb356e0bc
# Parent  b406507a953d1341d3bceb5cc53439a6fdc8703c
improved logging.

diff -r b406507a953d -r 247cbbb385de src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Tue Feb 03 19:01:27 2015 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Wed Feb 04 19:37:02 2015 +0100
@@ -72,7 +72,7 @@
  */
 public abstract class AnnotatorResourceImpl extends ServerResource {
 
-    protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.toString());
+	protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class.getCanonicalName());
 
     private AnnotationStore store;
 
@@ -170,11 +170,12 @@
         String authToken = requestHeaders.getFirstValue("x-annotator-auth-token", true);
         if (authToken == null) {
             if (!((BaseRestlet) getApplication()).isAuthorizationMode()) {
+            	// no token, no-auth mode -> anonymous
                 return Person.getAnonymous();
             }
+            // no token, auth mode -> null 
             return null;
         }
-        Person user = null;
 		try {
 			// decode token first to get consumer key
             JsonToken token = new JsonTokenParser(null, null).deserialize(authToken);
@@ -197,7 +198,7 @@
             JsonObject payload = token.getPayloadAsJsonObject();
             // userId is mandatory
             String userId = payload.get("userId").getAsString();
-            user = new Person(userId);
+            Person user = new Person(userId);
             // displayName is optional
             if (payload.has("displayName")) {
                 user.name = payload.get("displayName").getAsString();
@@ -211,13 +212,12 @@
                 }
                 user.groups = groups;
             }
+            logger.fine("auth OK! user=" + user);
+            return user;
         } catch (Exception e) {
             logger.warning("Error checking auth token: "+e.toString());
-            return null;
         }
-        // must be ok then
-        logger.fine("auth OK! user=" + user);
-        return user;
+        return null;
     }
 
     /**
diff -r b406507a953d -r 247cbbb385de src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java	Tue Feb 03 19:01:27 2015 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java	Wed Feb 04 19:37:02 2015 +0100
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package de.mpiwg.itgroup.annotations.restlet;
 
 /*
diff -r b406507a953d -r 247cbbb385de src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java	Tue Feb 03 19:01:27 2015 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java	Wed Feb 04 19:37:02 2015 +0100
@@ -119,8 +119,8 @@
             return null;
         }
 
-        logger.fine("sending:");
-        logger.fine(result.toString());
+        logger.fine("sending response");
+        logger.finest(result.toString());
         return new JsonRepresentation(result);
     }
 
diff -r b406507a953d -r 247cbbb385de src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Tue Feb 03 19:01:27 2015 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Wed Feb 04 19:37:02 2015 +0100
@@ -56,7 +56,7 @@
 
 public abstract class BaseRestlet extends Application {
 
-    public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.BaseRestlet");
+    public static Logger logger = Logger.getLogger(BaseRestlet.class.getCanonicalName());
 
     /**
      * Properties holding consumer keys and secrets.
@@ -153,8 +153,7 @@
         ConcurrentMap<String, Object> attrs = context.getAttributes();
         ServletContext sc = (ServletContext) attrs.get("org.restlet.ext.servlet.ServletContext");
         if (sc != null) {
-            logger = context.getLogger();
-            logger.info(getVersion() + " starting...");
+           logger.info(getVersion() + " starting...");
 
             /*
              * read config from webapp
@@ -240,8 +239,7 @@
                     try {
                         consumerKeys.load(ps);
                     } catch (IOException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
+                        logger.fine("Error loading consumer keys: "+e);
                     }
                     logger.fine("consumer keys: " + consumerKeys);
                 } else {