ACCUMULO-1584 applying Jonathan Hsieh's patch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f9759261 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f9759261 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f9759261 Branch: refs/heads/1.5.1-SNAPSHOT Commit: f9759261e12a5334af86ef9767750195692eded6 Parents: ffd16c7 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Oct 22 15:39:13 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Oct 22 15:39:13 2013 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/metrics/MetricsConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f9759261/src/server/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java b/src/server/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java index 6c6400f..5cc8e9a 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java +++ b/src/server/src/main/java/org/apache/accumulo/server/metrics/MetricsConfiguration.java @@ -35,7 +35,7 @@ public class MetricsConfiguration { private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(MetricsConfiguration.class); - private static final String metricsFileName = "conf/accumulo-metrics.xml"; + private static final String metricsFileName = "accumulo-metrics.xml"; private static boolean alreadyWarned = false; @@ -144,7 +144,7 @@ public class MetricsConfiguration { private void loadConfiguration() { // Check to see if ACCUMULO_HOME environment variable is set. - String ACUHOME = getEnvironmentConfiguration().getString("ACCUMULO_HOME"); + String ACUHOME = getEnvironmentConfiguration().getString("ACCUMULO_CONF_DIR"); if (null != ACUHOME) { // Try to load the metrics properties file File mFile = new File(ACUHOME, metricsFileName); @@ -179,7 +179,7 @@ public class MetricsConfiguration { } } else { if (!alreadyWarned) - log.warn("ACCUMULO_HOME variable not found in environment. Metrics collection will be disabled."); + log.warn("ACCUMULO_CONF_DIR variable not found in environment. Metrics collection will be disabled."); alreadyWarned = true; notFound = true; return;
