Cleanup some config settings from the Finagle port.

twitter-archive · Mar 8, 2012 · 200bcf8 · 200bcf8
1 parent f7a00b0
commit 200bcf8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 48 deletions.
diff --git a/config/development.scala b/config/development.scala
@@ -54,27 +54,13 @@ class ProductionNameServerReplica(host: String) extends Mysql {
 new FlockDB {
   aggregateJobsPageSize = 500
 
-  val server = new FlockDBServer with TSelectorServer {
-    timeout = 100.millis
-    idleTimeout = 60.seconds
-    threadPool.minThreads = 250
-    threadPool.maxThreads = 250
-  }
-
   mappingFunction                   = ByteSwapper
   jobRelay                          = NoJobRelay
   nameServerReplicas                = Seq(new ProductionNameServerReplica("localhost"))
   jobInjector.timeout               = 100.millis
   jobInjector.idleTimeout           = 60.seconds
   jobInjector.threadPool.minThreads = 30
 
-  val readFuture = new Future {
-    poolSize = 100
-    maxPoolSize = 100
-    keepAlive = 5.seconds
-    timeout = 6.seconds
-  }
-
   val databaseConnection = new Credentials {
     val hostnames = Seq("localhost")
     val database = "edges_development"

diff --git a/config/production.scala b/config/production.scala
@@ -50,13 +50,6 @@ class ProductionNameServerReplica(host: String) extends Mysql {
 }
 
 new FlockDB {
-  val server = new FlockDBServer with THsHaServer {
-    timeout = 100.millis
-    idleTimeout = 60.seconds
-    threadPool.minThreads = 250
-    threadPool.maxThreads = 250
-  }
-
   mappingFunction = ByteSwapper
   jobRelay        = NoJobRelay
 
@@ -69,13 +62,6 @@ new FlockDB {
   jobInjector.idleTimeout           = 60.seconds
   jobInjector.threadPool.minThreads = 30
 
-  val readFuture = new Future {
-    poolSize = 100
-    maxPoolSize = 100
-    keepAlive = 5.seconds
-    timeout = 6.seconds
-  }
-
   val databaseConnection = new Credentials {
     val hostnames = Seq("localhost")
     val database = "edges"

diff --git a/config/test.scala b/config/test.scala
@@ -53,13 +53,6 @@ class NameserverQueryEvaluator extends QueryEvaluator {
 }
 
 new FlockDB {
-  val server = new FlockDBServer with THsHaServer {
-    timeout = 100.millis
-    idleTimeout = 60.seconds
-    threadPool.minThreads = 250
-    threadPool.maxThreads = 250
-  }
-
   mappingFunction = Identity
   jobRelay        = NoJobRelay
 
@@ -76,15 +69,6 @@ new FlockDB {
   jobInjector.idleTimeout           = 60.seconds
   jobInjector.threadPool.minThreads = 30
 
-
-  val readFuture = new Future {
-    poolSize = 100
-    maxPoolSize = 100
-    keepAlive = 5.seconds
-    timeout = 500.millis
-  }
-
-
   // Database Connectivity
 
   val databaseConnection = new Credentials {

diff --git a/src/main/scala/com/twitter/flockdb/config/FlockDB.scala b/src/main/scala/com/twitter/flockdb/config/FlockDB.scala
@@ -8,7 +8,7 @@ import com.twitter.flockdb.queries.QueryTree
 import com.twitter.flockdb.queries
 
 
-trait FlockDBServer extends TServer {
+class FlockDBServer {
   var name = "flockdb_edges"
   var port = 7915
 }
@@ -23,7 +23,7 @@ trait IntersectionQuery {
 }
 
 trait FlockDB extends GizzardServer {
-  def server: FlockDBServer
+  var server: new FlockDBServer
 
   var intersectionQuery: IntersectionQuery = new IntersectionQuery { }
   var aggregateJobsPageSize         = 500
@@ -34,7 +34,5 @@ trait FlockDB extends GizzardServer {
   def lowLatencyQueryEvaluator: AsyncQueryEvaluator
   def materializingQueryEvaluator: AsyncQueryEvaluator
 
-  def readFuture: Future
-
   def adminConfig: AdminServiceConfig
 }