Merge branch 'master' of http://git.local.twitter.com/scala-bootstrapper

travisb · Jul 20, 2011 · 4550688 · 4550688
2 parents 02ce6f4 + 866fe3c
commit 4550688
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/lib/template/config/development.scala.erb b/lib/template/config/development.scala.erb
@@ -19,10 +19,7 @@ new BirdNameServiceConfig {
   // Expert-only: Ostrich stats and logger configuration.
 
   admin.statsNodes = new StatsConfig {
-    reporters = new JsonStatsLoggerConfig {
-      loggerName = "stats"
-      serviceName = "birdname"
-    } :: new TimeSeriesCollectorConfig
+    reporters = new TimeSeriesCollectorConfig
   }
 
   loggers =

diff --git a/lib/template/config/production.scala.erb b/lib/template/config/production.scala.erb
@@ -17,11 +17,9 @@ new BirdNameServiceConfig {
   // End user configuration
 
   // Expert-only: Ostrich stats and logger configuration.
+
   admin.statsNodes = new StatsConfig {
-    reporters = new JsonStatsLoggerConfig {
-      loggerName = "stats"
-      serviceName = "birdname"
-    } :: new TimeSeriesCollectorConfig
+    reporters = new TimeSeriesCollectorConfig
   }
 
   loggers =

diff --git a/lib/template/config/staging.scala.erb b/lib/template/config/staging.scala.erb
@@ -17,11 +17,9 @@ new BirdNameServiceConfig {
   // End user configuration
 
   // Expert-only: Ostrich stats and logger configuration.
+
   admin.statsNodes = new StatsConfig {
-    reporters = new JsonStatsLoggerConfig {
-      loggerName = "stats"
-      serviceName = "birdname"
-    } :: new TimeSeriesCollectorConfig
+    reporters = new TimeSeriesCollectorConfig
   }
 
   loggers =

diff --git a/lib/template/config/test.scala.erb b/lib/template/config/test.scala.erb
@@ -17,12 +17,6 @@ new BirdNameServiceConfig {
   // End user configuration
 
   // Expert-only: Ostrich stats and logger configuration.
-  admin.statsNodes = new StatsConfig {
-    reporters = new JsonStatsLoggerConfig {
-      loggerName = "stats"
-      serviceName = "birdname"
-    } :: new TimeSeriesCollectorConfig
-  }
 
   loggers =
     new LoggerConfig {