diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-06-19 00:47:07 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-06-19 00:47:07 -0300 |
| commit | 1150d528eb5231993e542c086e2df90cf760d8a7 (patch) | |
| tree | e1c86f9a115872073c46890b5ef32dbe1bd0bd3d /kamon-playground | |
| parent | 35b8a715d78ddd194d410ba0cc2119b5a1caa924 (diff) | |
| parent | 4abab8df49d1bc5d9a051a8b54852e0712be7b74 (diff) | |
| download | Kamon-1150d528eb5231993e542c086e2df90cf760d8a7.tar.gz Kamon-1150d528eb5231993e542c086e2df90cf760d8a7.tar.bz2 Kamon-1150d528eb5231993e542c086e2df90cf760d8a7.zip | |
Merge branch 'master' into release-0.2
Conflicts:
kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
project/Dependencies.scala
project/Projects.scala
version.sbt
Diffstat (limited to 'kamon-playground')
| -rw-r--r-- | kamon-playground/src/main/resources/application.conf | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/kamon-playground/src/main/resources/application.conf b/kamon-playground/src/main/resources/application.conf index aaafd836..3d57141a 100644 --- a/kamon-playground/src/main/resources/application.conf +++ b/kamon-playground/src/main/resources/application.conf @@ -1,8 +1,6 @@ akka { - loggers = [ "akka.event.slf4j.Slf4jLogger" ] loglevel = INFO - extensions = ["kamon.newrelic.NewRelic", "kamon.statsd.StatsD"] actor { debug { @@ -43,7 +41,7 @@ kamon { }, { dispatcher { - includes = [ "default-dispatcher" ] + includes = [ "akka.actor.default-dispatcher" ] excludes = [] } }, @@ -66,7 +64,7 @@ kamon { significant-value-digits = 1 } mailbox-size { - highest-trackable-value = 999999999 + highest-trackable-value = 99999999 significant-value-digits = 1 } } @@ -85,4 +83,12 @@ kamon { ] } } -}
\ No newline at end of file + + weaver { + showWeaveInfo = on + verbose = off + debug = off + showWarn = off + } +} + |