Changeset 89:247cbbb385de in AnnotationManagerN4J

Timestamp:

Feb 4, 2015, 6:37:02 PM (9 years ago)

Author:

casties

Branch:

default

Message:

improved logging.

Location:

src/main/java/de/mpiwg/itgroup/annotations/restlet

Files:

• AnnotatorResourceImpl.java (modified) (4 diffs)
• AnnotatorRestlet.java (modified) (1 diff)
• AnnotatorSearch.java (modified) (1 diff)
• BaseRestlet.java (modified) (3 diffs)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -73 +73 @@
 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;
@@ -171 +171 @@
         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
@@ -198 +199 @@
             // 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")) {
@@ -212 +213 @@
                 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;
     }
 

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java

@@ -1 @@
-/**
- * 
- */
 package de.mpiwg.itgroup.annotations.restlet;
 

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java

@@ -120 +120 @@
         }
 
-        logger.fine("sending:");
-        logger.fine(result.toString());
+        logger.fine("sending response");
+        logger.finest(result.toString());
         return new JsonRepresentation(result);
     }

src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java

@@ -57 +57 @@
 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());
 
     /**
@@ -154 +154 @@
         ServletContext sc = (ServletContext) attrs.get("org.restlet.ext.servlet.ServletContext");
         if (sc != null) {
-            logger = context.getLogger();
-            logger.info(getVersion() + " starting...");
+           logger.info(getVersion() + " starting...");
 
             /*
@@ -241 +240 @@
                         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);