accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [4/6] git commit: ACCUMULO-2160 back-port real bugs found by findbugs
Date Fri, 10 Jan 2014 15:15:20 GMT
ACCUMULO-2160 back-port real bugs found by findbugs


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6d49e1a48af4dfb0b9d5a8bcf152567b97dd9c79
Parents: 5dd6f84
Author: Eric Newton <eric.newton@gmail.com>
Authored: Thu Jan 9 15:56:35 2014 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Thu Jan 9 15:56:35 2014 -0500

----------------------------------------------------------------------
 src/server/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/6d49e1a4/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index 4e909a7..253962b 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -117,7 +117,7 @@ public class Accumulo {
       System.setProperty("org.apache.accumulo.core.host.log", localhost);
     
     // Use a specific log config, if it exists
-    String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR"));
+    String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR"),
application);
     if (!new File(logConfig).exists()) {
       // otherwise, use the generic config
       logConfig = String.format("%s/generic_logger.xml", System.getenv("ACCUMULO_CONF_DIR"));


Mime
View raw message