accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/3] git commit: ACCUMULO-1839 Fix ACCUMULO_CONF_DIR usage in Accumulo.java
Date Wed, 13 Nov 2013 18:16:16 GMT
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT e5dfd06ce -> 743d64b29
  refs/heads/master 4d7c1ccda -> aac0b66ff


ACCUMULO-1839 Fix ACCUMULO_CONF_DIR usage in Accumulo.java

The lookup of auditLog.xml in Accumulo.java was still looking in
$ACCUMULO_HOME/conf instead of $ACCUMULO_CONF_DIR.

Signed-off-by: Eric Newton <eric.newton@gmail.com>


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 743d64b29d83587170e71c22dab9915548b61e3e
Parents: e5dfd06
Author: Bill Havanki <bhavanki@cloudera.com>
Authored: Tue Nov 12 09:53:54 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Wed Nov 13 13:16:06 2013 -0500

----------------------------------------------------------------------
 server/base/src/main/java/org/apache/accumulo/server/Accumulo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/743d64b2/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 57c4e2a..bcde150 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -172,7 +172,7 @@ public class Accumulo {
       DOMConfigurator.configureAndWatch(logConfig, 5000);
     
     // Read the auditing config
-    String auditConfig = String.format("%s/conf/auditLog.xml", System.getenv("ACCUMULO_HOME"),
application);
+    String auditConfig = String.format("%s/auditLog.xml", System.getenv("ACCUMULO_CONF_DIR"),
application);
     
     DOMConfigurator.configureAndWatch(auditConfig, 5000);
     


Mime
View raw message