aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnak <ivantopo@gmail.com>2013-10-04 16:42:56 -0300
committerIvan Topolnak <ivantopo@gmail.com>2013-10-04 16:42:56 -0300
commitab784051c0f7f976780b8a85ac4f4600b6ca91cc (patch)
treeea47d92bea6e37b2c73e68c2dc9685215af95262
parent20f9920d4704e28ee8aa066d151b522c0d14e166 (diff)
downloadKamon-ab784051c0f7f976780b8a85ac4f4600b6ca91cc.tar.gz
Kamon-ab784051c0f7f976780b8a85ac4f4600b6ca91cc.tar.bz2
Kamon-ab784051c0f7f976780b8a85ac4f4600b6ca91cc.zip
release 0.0.5
-rw-r--r--kamon-core/src/main/resources/application.conf38
-rw-r--r--kamon-core/src/main/resources/reference.conf11
-rw-r--r--kamon-core/src/test/resources/logback.xml (renamed from kamon-core/src/main/resources/logback.xml)0
-rw-r--r--kamon-core/src/test/resources/newrelic.yml (renamed from kamon-core/src/main/resources/newrelic.yml)0
-rw-r--r--project/Build.scala6
-rw-r--r--project/Settings.scala2
6 files changed, 15 insertions, 42 deletions
diff --git a/kamon-core/src/main/resources/application.conf b/kamon-core/src/main/resources/application.conf
deleted file mode 100644
index 57f67d32..00000000
--- a/kamon-core/src/main/resources/application.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-akka {
- loglevel = INFO
- stdout-loglevel = INFO
- log-dead-letters = on
-
- #extensions = ["kamon.dashboard.DashboardExtension"]
- loggers = ["kamon.newrelic.NewRelicErrorLogger", "akka.event.slf4j.Slf4jLogger"]
-
- actor {
- default-dispatcher {
- fork-join-executor {
- # Min number of threads to cap factor-based parallelism number to
- parallelism-min = 2
-
- # The parallelism factor is used to determine thread pool size using the
- # following formula: ceil(available processors * factor). Resulting size
- # is then bounded by the parallelism-min and parallelism-max values.
- parallelism-factor = 3.0
-
- # Max number of threads to cap factor-based parallelism number to
- parallelism-max = 8
- }
-
- throughput = 100
- }
- debug {
- unhandled = on
- }
- }
-}
-
-
-
-
-
-
-
-
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf
new file mode 100644
index 00000000..29532595
--- /dev/null
+++ b/kamon-core/src/main/resources/reference.conf
@@ -0,0 +1,11 @@
+akka {
+ loggers = ["kamon.newrelic.NewRelicErrorLogger", "akka.event.slf4j.Slf4jLogger"]
+}
+
+
+
+
+
+
+
+
diff --git a/kamon-core/src/main/resources/logback.xml b/kamon-core/src/test/resources/logback.xml
index 2ae1e3bd..2ae1e3bd 100644
--- a/kamon-core/src/main/resources/logback.xml
+++ b/kamon-core/src/test/resources/logback.xml
diff --git a/kamon-core/src/main/resources/newrelic.yml b/kamon-core/src/test/resources/newrelic.yml
index 1b1ad53b..1b1ad53b 100644
--- a/kamon-core/src/main/resources/newrelic.yml
+++ b/kamon-core/src/test/resources/newrelic.yml
diff --git a/project/Build.scala b/project/Build.scala
index 022ff787..525cf96c 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -23,9 +23,9 @@ object Build extends Build {
.settings(
libraryDependencies ++=
- compile(akkaActor, akkaAgent, aspectJ, aspectJWeaver, metrics, newrelic, sprayJson, logback, akkaSlf4j) ++
- compile(sprayCan, sprayClient, sprayRouting) ++
- test(scalatest, akkaTestKit, sprayTestkit))
+ compile(akkaActor, akkaAgent, aspectJ, aspectJWeaver, metrics, newrelic, sprayJson) ++
+ provided(sprayCan, sprayClient, sprayRouting, logback, akkaSlf4j) ++
+ test(scalatest, akkaTestKit, sprayTestkit, logback, akkaSlf4j))
//.dependsOn(kamonDashboard)
lazy val kamonDashboard = Project("kamon-dashboard", file("kamon-dashboard"))
diff --git a/project/Settings.scala b/project/Settings.scala
index 356273a6..8db28a7e 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -3,7 +3,7 @@ import Keys._
import spray.revolver.RevolverPlugin.Revolver
object Settings {
- val VERSION = "0.0.4"
+ val VERSION = "0.0.5"
lazy val basicSettings = seq(
version := VERSION,