accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6'
Date Mon, 27 Oct 2014 19:13:01 GMT
Merge branch '1.6'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/014d9d95
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/014d9d95
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/014d9d95

Branch: refs/heads/master
Commit: 014d9d95549911e131dfa5509cd347193151bad4
Parents: b975271 e4dbe89
Author: Josh Elser <elserj@apache.org>
Authored: Mon Oct 27 14:59:01 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Oct 27 14:59:01 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/server/Accumulo.java     |  5 +++--
 .../server/watcher/Log4jConfiguration.java       | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/014d9d95/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 80dff9b,1e7658a..e4d6264
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@@ -165,11 -164,12 +165,12 @@@ public class Accumulo 
      // Set up local file-based logging right away
      Log4jConfiguration logConf = new Log4jConfiguration(logConfigFile);
      logConf.resetLogger();
+ 
+     // Watch the auditLog.xml for the future updates
+     DOMConfigurator.configureAndWatch(auditConfig, 5000);
    }
  
 -  public static void init(VolumeManager fs, ServerConfiguration serverConfig, String application)
throws IOException {
 +  public static void init(VolumeManager fs, ServerConfigurationFactory serverConfig, String
application) throws IOException {
      final AccumuloConfiguration conf = serverConfig.getConfiguration();
      final Instance instance = serverConfig.getInstance();
  


Mime
View raw message