You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/11/25 01:20:11 UTC
[2/3] git commit: Cleanup GraphiteSink.scala based on feedback
Cleanup GraphiteSink.scala based on feedback
* Reorder imports according to the style guide
* Consistently use propertyToOption in all places
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/1360f62d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/1360f62d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/1360f62d
Branch: refs/heads/master
Commit: 1360f62d15170bd295ceaba85f39401fd8109e51
Parents: ef85a51
Author: Russell Cardullo <ru...@gmail.com>
Authored: Mon Nov 18 08:37:09 2013 -0800
Committer: Russell Cardullo <ru...@gmail.com>
Committed: Mon Nov 18 08:53:39 2013 -0800
----------------------------------------------------------------------
.../org/apache/spark/metrics/sink/GraphiteSink.scala | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/1360f62d/core/src/main/scala/org/apache/spark/metrics/sink/GraphiteSink.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/metrics/sink/GraphiteSink.scala b/core/src/main/scala/org/apache/spark/metrics/sink/GraphiteSink.scala
index eb1315e..cdcfec8 100644
--- a/core/src/main/scala/org/apache/spark/metrics/sink/GraphiteSink.scala
+++ b/core/src/main/scala/org/apache/spark/metrics/sink/GraphiteSink.scala
@@ -17,13 +17,13 @@
package org.apache.spark.metrics.sink
-import com.codahale.metrics.MetricRegistry
-import com.codahale.metrics.graphite.{GraphiteReporter, Graphite}
-
import java.util.Properties
import java.util.concurrent.TimeUnit
import java.net.InetSocketAddress
+import com.codahale.metrics.MetricRegistry
+import com.codahale.metrics.graphite.{GraphiteReporter, Graphite}
+
import org.apache.spark.metrics.MetricsSystem
class GraphiteSink(val property: Properties, val registry: MetricRegistry) extends Sink {
@@ -50,12 +50,12 @@ class GraphiteSink(val property: Properties, val registry: MetricRegistry) exten
val host = propertyToOption(GRAPHITE_KEY_HOST).get
val port = propertyToOption(GRAPHITE_KEY_PORT).get.toInt
- val pollPeriod = Option(property.getProperty(GRAPHITE_KEY_PERIOD)) match {
+ val pollPeriod = propertyToOption(GRAPHITE_KEY_PERIOD) match {
case Some(s) => s.toInt
case None => GRAPHITE_DEFAULT_PERIOD
}
- val pollUnit = Option(property.getProperty(GRAPHITE_KEY_UNIT)) match {
+ val pollUnit = propertyToOption(GRAPHITE_KEY_UNIT) match {
case Some(s) => TimeUnit.valueOf(s.toUpperCase())
case None => TimeUnit.valueOf(GRAPHITE_DEFAULT_UNIT)
}