diff options
author | Diego <diegolparra@gmail.com> | 2015-12-17 14:27:13 -0300 |
---|---|---|
committer | Diego <diegolparra@gmail.com> | 2015-12-17 14:27:13 -0300 |
commit | cc947dd551047a84b5754c671a937b3df6787088 (patch) | |
tree | 656f7c1f458915927eb4eb6c1f9a5825567f305c /kamon-jmx/src | |
parent | 07ed77a81b5bdbef9bd9d23628f4aa8196e9f3a2 (diff) | |
download | Kamon-cc947dd551047a84b5754c671a937b3df6787088.tar.gz Kamon-cc947dd551047a84b5754c671a937b3df6787088.tar.bz2 Kamon-cc947dd551047a84b5754c671a937b3df6787088.zip |
= All: downgrade sbt to 0.13.8 in order to avoid issues with scalariform
Diffstat (limited to 'kamon-jmx/src')
-rw-r--r-- | kamon-jmx/src/main/scala/kamon/jmx/JMXReporter.scala | 4 | ||||
-rw-r--r-- | kamon-jmx/src/main/scala/kamon/jmx/JMXReporterActor.scala | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kamon-jmx/src/main/scala/kamon/jmx/JMXReporter.scala b/kamon-jmx/src/main/scala/kamon/jmx/JMXReporter.scala index e1e12aea..8dba51a9 100644 --- a/kamon-jmx/src/main/scala/kamon/jmx/JMXReporter.scala +++ b/kamon-jmx/src/main/scala/kamon/jmx/JMXReporter.scala @@ -16,7 +16,7 @@ package kamon.jmx -import javax.management.{JMException, JMRuntimeException} +import javax.management.{ JMException, JMRuntimeException } import akka.actor._ import akka.event.Logging @@ -64,7 +64,7 @@ private trait ActorJMXSupervisor extends Actor with ActorLogging { Stop case t ⇒ // Use the default supervisor strategy otherwise. - super.supervisorStrategy.decider.applyOrElse(t, (_: Any) => Escalate) + super.supervisorStrategy.decider.applyOrElse(t, (_: Any) ⇒ Escalate) } } diff --git a/kamon-jmx/src/main/scala/kamon/jmx/JMXReporterActor.scala b/kamon-jmx/src/main/scala/kamon/jmx/JMXReporterActor.scala index 00a8668e..783d7898 100644 --- a/kamon-jmx/src/main/scala/kamon/jmx/JMXReporterActor.scala +++ b/kamon-jmx/src/main/scala/kamon/jmx/JMXReporterActor.scala @@ -19,9 +19,9 @@ package kamon.jmx import java.lang.management.ManagementFactory import javax.management._ -import akka.actor.{Actor, Props} +import akka.actor.{ Actor, Props } import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot -import kamon.metric.instrument.{Counter, Histogram, InstrumentSnapshot} +import kamon.metric.instrument.{ Counter, Histogram, InstrumentSnapshot } import kamon.util.logger.LazyLogger import scala.collection.concurrent.TrieMap @@ -145,7 +145,7 @@ private object MBeanManager { try { mbs.unregisterMBean(name) } catch { - case e: InstanceNotFoundException ⇒ if (log.isTraceEnabled) log.trace(s"Error unregistering $name", e) + case e: InstanceNotFoundException ⇒ if (log.isTraceEnabled) log.trace(s"Error unregistering $name", e) case e: MBeanRegistrationException ⇒ if (log.isDebugEnabled) log.debug(s"Error unregistering $name", e) }) registeredMBeans.clear() @@ -197,7 +197,7 @@ private class JMXReporterActor extends Actor { } { metricSnapshot match { case hs: Histogram.Snapshot ⇒ - updateHystogramMetrics(entity.category, entity.name + "." + metricKey.name, hs) + updateHystogramMetrics(entity.category, entity.name + "." + metricKey.name, hs) case cs: Counter.Snapshot ⇒ updateCounterMetrics(entity.category, entity.name + "." + metricKey.name, cs) } |