From 08ff99886cc6a45528a167968c8ab4ac3dcd4add Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Fri, 13 Feb 2015 23:04:47 +0000 Subject: [PATCH] rename METRICS_CONF: DEFAULT_METRICS_CONF_FILENAME --- .../main/scala/org/apache/spark/metrics/MetricsConfig.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala b/core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala index e8b017016d85e..55b156d3dd452 100644 --- a/core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala +++ b/core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala @@ -30,7 +30,7 @@ private[spark] class MetricsConfig(val configFile: Option[String]) extends Loggi val DEFAULT_PREFIX = "*" val INSTANCE_REGEX = "^(\\*|[a-zA-Z]+)\\.(.+)".r - val METRICS_CONF = "metrics.properties" + val DEFAULT_METRICS_CONF_FILENAME = "metrics.properties" val properties = new Properties() var propertyCategories: mutable.HashMap[String, Properties] = null @@ -49,7 +49,7 @@ private[spark] class MetricsConfig(val configFile: Option[String]) extends Loggi // If spark.metrics.conf is not set, try to get file in class path val isOpt: Option[InputStream] = configFile.map(new FileInputStream(_)).orElse { try { - Option(Utils.getSparkClassLoader.getResourceAsStream(METRICS_CONF)) + Option(Utils.getSparkClassLoader.getResourceAsStream(DEFAULT_METRICS_CONF_FILENAME)) } catch { case e: Exception => logError("Error loading default configuration file", e)