You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/03/20 18:23:38 UTC
svn commit: r1303020 -
/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
Author: ecn
Date: Tue Mar 20 17:23:37 2012
New Revision: 1303020
URL: http://svn.apache.org/viewvc?rev=1303020&view=rev
Log:
ACCUMULO-407 stop watching the log4j config: it conflicts with the xml config
Modified:
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1303020&r1=1303019&r2=1303020&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java Tue Mar 20 17:23:37 2012
@@ -40,7 +40,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.zookeeper.KeeperException;
@@ -125,10 +124,6 @@ public class Accumulo {
// Configure logging
DOMConfigurator.configureAndWatch(logConfig, 5000);
- // General purpose logging control independent from specific component log config
- String propertyLogConfig = String.format("%s/conf/log4j.properties", System.getenv("ACCUMULO_HOME"));
- PropertyConfigurator.configureAndWatch(propertyLogConfig, 5000);
-
log.info(application + " starting");
log.info("Instance " + HdfsZooInstance.getInstance().getInstanceID());
log.info("Data Version " + Accumulo.getAccumuloPersistentVersion());