Changeset 75:25eb2e1df106 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java

Timestamp:

Mar 21, 2014, 12:32:41 PM (10 years ago)

Author:

casties

Branch:

default

Message:

change logging to java.util.logging.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java (modified) (16 diffs)

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

@@ -32 +32 @@
 import java.util.Properties;
 import java.util.concurrent.ConcurrentMap;
+import java.util.logging.Logger;
 
 import javax.naming.NamingEnumeration;
@@ -42 +43 @@
 import javax.servlet.ServletContext;
 
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
@@ -57 +56 @@
 public abstract class BaseRestlet extends Application {
 
-    public static Logger logger = Logger.getLogger(BaseRestlet.class);
+    public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.BaseRestlet");
 
     /**
@@ -148 +147 @@
         ServletContext sc = (ServletContext) attrs.get("org.restlet.ext.servlet.ServletContext");
         if (sc != null) {
-            if (sc.getAttribute("annotationserver.log4j.configured") == null) {
-                // TODO: is this the right place to run the log4j configurator?
-                BasicConfigurator.configure();
-                sc.setAttribute("annotationserver.log4j.configured", "done");
-            }
+            logger = context.getLogger();
             logger.info(getVersion() + " starting...");
 
@@ -163 +158 @@
                 InputStream ps = getResourceAsStream(sc, CONFIG_PROPS_PATH);
                 if (ps != null) {
-                    logger.debug("loading config from " + CONFIG_PROPS_PATH);
+                    logger.fine("loading config from " + CONFIG_PROPS_PATH);
                     try {
                         serverConfig.load(ps);
@@ -187 +182 @@
                         }
                     } catch (IOException e) {
-                        logger.warn("Error loading server config: ", e);
+                        logger.warning("Error loading server config: "+e.toString());
                     }
-                    logger.debug("config: " + serverConfig);
+                    logger.fine("config: " + serverConfig);
                 } else {
-                    logger.error("Unable to get resource " + CONFIG_PROPS_PATH);
+                    logger.severe("Unable to get resource " + CONFIG_PROPS_PATH);
                 }
                 // store config
@@ -204 +199 @@
                 String dbFn = getResourcePath(sc, graphdbPath);
                 if (dbFn != null) {
-                    logger.debug("opening DB " + dbFn);
+                    logger.fine("opening DB " + dbFn);
                     GraphDatabaseBuilder graphDbBuilder = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(dbFn);
                     graphDbBuilder.setConfig(GraphDatabaseSettings.allow_store_upgrade, "true");
@@ -216 +211 @@
                     // admin server
                     srv = new WrappingNeoServerBootstrapper((GraphDatabaseAPI) graphDb);
-                    logger.debug("Starting DB admin server...");
+                    logger.fine("Starting DB admin server...");
                     // store in context
                     sc.setAttribute(GRAPHDBSRV_KEY, srv);
                     srv.start();
                 } else {
-                    logger.error("Unable to get resource " + dbFn);
+                    logger.severe("Unable to get resource " + dbFn);
                 }
             } else {
@@ -235 +230 @@
                 InputStream ps = getResourceAsStream(sc, CONSUMER_KEYS_PATH);
                 if (ps != null) {
-                    logger.debug("loading consumer keys from " + CONSUMER_KEYS_PATH);
+                    logger.fine("loading consumer keys from " + CONSUMER_KEYS_PATH);
                     try {
                         consumerKeys.load(ps);
@@ -242 +237 @@
                         e.printStackTrace();
                     }
-                    logger.debug("consumer keys: " + consumerKeys);
+                    logger.fine("consumer keys: " + consumerKeys);
                 } else {
-                    logger.error("Unable to get resource " + CONSUMER_KEYS_PATH);
+                    logger.severe("Unable to get resource " + CONSUMER_KEYS_PATH);
                 }
                 // store config
@@ -250 +245 @@
             }
         } else {
-            logger.error("Unable to get ServletContext!");
+            logger.severe("Unable to get ServletContext!");
         }
     }
@@ -302 +297 @@
             dctx = new InitialDirContext(env);
         } catch (NamingException e) {
-            logger.error("Error in getFullNameFromLDAP!", e);
+            logger.warning("Error in getFullNameFromLDAP! "+e);
             return retString;
         }
@@ -325 +320 @@
             }
         } catch (NamingException e) {
-            logger.error("Error in getFullNameFromLDAP!", e);
+            logger.warning("Error in getFullNameFromLDAP!"+e);
         }
 
@@ -331 +326 @@
             dctx.close();
         } catch (NamingException e) {
-            logger.error("Error in getFullNameFromLDAP!", e);
+            logger.warning("Error in getFullNameFromLDAP!"+e);
         }
         return retString;
@@ -363 +358 @@
                 File pf = new File(sc.getRealPath(webPath));
                 if (pf.canRead()) {
-                    logger.debug("trying file for: " + pf);
+                    logger.fine("trying file for: " + pf);
                     try {
                         ps = new FileInputStream(pf);
                     } catch (FileNotFoundException e) {
-                        logger.error(e);
+                        logger.severe(e.toString());
                     }
                 } else {
@@ -409 +404 @@
          */
         if (srv != null) {
-            logger.debug("Stopping DB admin server...");
+            logger.info("Stopping DB admin server...");
             srv.stop();
             srv = null;
         }
         if (graphDb != null) {
-            logger.debug("Stopping DB...");
+            logger.info("Stopping DB...");
             graphDb.shutdown();
             graphDb = null;