Mercurial > hg > AnnotationManagerN4J
diff src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java @ 75:25eb2e1df106
change logging to java.util.logging.
author | casties |
---|---|
date | Fri, 21 Mar 2014 13:32:41 +0100 |
parents | e5ff09208c28 |
children | 4724fc7b4733 |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java Wed Mar 12 12:42:28 2014 +0100 +++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java Fri Mar 21 13:32:41 2014 +0100 @@ -31,6 +31,7 @@ import java.util.Hashtable; import java.util.Properties; import java.util.concurrent.ConcurrentMap; +import java.util.logging.Logger; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -41,8 +42,6 @@ import javax.naming.directory.SearchResult; 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; import org.neo4j.graphdb.factory.GraphDatabaseFactory; @@ -56,7 +55,7 @@ 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"); /** * Properties holding consumer keys and secrets. @@ -147,11 +146,7 @@ ConcurrentMap<String, Object> attrs = context.getAttributes(); 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..."); /* @@ -162,7 +157,7 @@ serverConfig = new Properties(); 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); /* @@ -186,11 +181,11 @@ AnnotationStore.ANNOTATION_URI_PREFIX = serverConfig.getProperty(ANNOTATIONS_URI_KEY); } } 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 sc.setAttribute(SERVERCONFIG_KEY, serverConfig); @@ -203,7 +198,7 @@ */ 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"); graphDb = graphDbBuilder.newGraphDatabase(); @@ -215,12 +210,12 @@ sc.setAttribute(ANNSTORE_KEY, store); // 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 { // get existing AnnotationStore @@ -234,22 +229,22 @@ consumerKeys = new Properties(); 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); } catch (IOException e) { // TODO Auto-generated catch block 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 sc.setAttribute(CONSUMERKEYS_KEY, consumerKeys); } } else { - logger.error("Unable to get ServletContext!"); + logger.severe("Unable to get ServletContext!"); } } @@ -301,7 +296,7 @@ try { dctx = new InitialDirContext(env); } catch (NamingException e) { - logger.error("Error in getFullNameFromLDAP!", e); + logger.warning("Error in getFullNameFromLDAP! "+e); return retString; } @@ -324,13 +319,13 @@ retString = (String) attr.get(); } } catch (NamingException e) { - logger.error("Error in getFullNameFromLDAP!", e); + logger.warning("Error in getFullNameFromLDAP!"+e); } try { dctx.close(); } catch (NamingException e) { - logger.error("Error in getFullNameFromLDAP!", e); + logger.warning("Error in getFullNameFromLDAP!"+e); } return retString; } @@ -362,11 +357,11 @@ // try as file 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 { // use class loader @@ -408,12 +403,12 @@ * trying to clean up databases, not sure if this is the right way... */ 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; }