aboutsummaryrefslogtreecommitdiff
path: root/kamon-playground/src/main
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-08-13 22:33:15 -0400
committerIvan Topolnjak <ivantopo@gmail.com>2014-08-13 22:33:15 -0400
commitd9741388ecaa35734189a6da4294465ba8dfcdce (patch)
treefa62cc5d6578572feefd93cd25a52baefce50db0 /kamon-playground/src/main
parent207034dd531687b28819980bb61831576ef5a3ea (diff)
parent9fe3750f7cf8b3a85f7db8ebd1cc8daff097935e (diff)
downloadKamon-d9741388ecaa35734189a6da4294465ba8dfcdce.tar.gz
Kamon-d9741388ecaa35734189a6da4294465ba8dfcdce.tar.bz2
Kamon-d9741388ecaa35734189a6da4294465ba8dfcdce.zip
Merge branch 'master' into release-0.3_scala-2.11
Diffstat (limited to 'kamon-playground/src/main')
-rw-r--r--kamon-playground/src/main/resources/application.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/kamon-playground/src/main/resources/application.conf b/kamon-playground/src/main/resources/application.conf
index bac3c97e..5d96c7f6 100644
--- a/kamon-playground/src/main/resources/application.conf
+++ b/kamon-playground/src/main/resources/application.conf
@@ -1,7 +1,7 @@
akka {
loglevel = INFO
- extensions = ["kamon.logreporter.LogReporter"]
+ extensions = ["kamon.logreporter.LogReporter", "kamon.system.SystemMetrics"]
actor {
debug {
@@ -86,7 +86,7 @@ kamon {
}
weaver {
- showWeaveInfo = on
+ showWeaveInfo = off
verbose = off
debug = off
showWarn = off