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/16 13:54:54 UTC
svn commit: r1301473 - in /incubator/accumulo/trunk: ./
server/src/main/java/org/apache/accumulo/server/Accumulo.java
Author: ecn
Date: Fri Mar 16 12:54:54 2012
New Revision: 1301473
URL: http://svn.apache.org/viewvc?rev=1301473&view=rev
Log:
ACCUMULO-407: merge to trunk
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 12:54:54 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1300181,1300277,1300713,1301056
+/incubator/accumulo/branches/1.4:1201902-1300181,1300277,1300713,1301056,1301471
Modified: incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1301473&r1=1301472&r2=1301473&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java (original)
+++ incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/Accumulo.java Fri Mar 16 12:54:54 2012
@@ -40,6 +40,7 @@ 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;
@@ -122,7 +123,11 @@ public class Accumulo {
LogLog.setQuietMode(true);
// Configure logging
- DOMConfigurator.configure(logConfig);
+ 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());