Merge pull request #136 from broadinstitute/develop

Merge develop changes to staging

src/main/resources/reference.conf

@@ -4,8 +4,10 @@ webservice.port = 8000
 webservice.interface = 0.0.0.0
 instance.name = "reference"
 
-mongodb.host = "localhost"
-mongodb.port = 27017
+mongodb {
+  hosts=["localhost"]
+  ports=[27017]
+}
 
 environment = "local"
 mockAuthenticatedUserEmail = "broadprometheustest@gmail.com"
@@ -41,17 +43,17 @@ kamon.internal-config {
 
 kamon.metric.filters {
   akka-dispatcher {
-    includes = [ "agora/user/**" ]
-    excludes = [ ]
+    includes = ["agora/user/**"]
+    excludes = []
   }
 
   akka-actor {
-    includes = [ "agora/user/**" ]
-    excludes = [ ]
+    includes = ["agora/user/**"]
+    excludes = []
   }
 
   akka-router {
-    includes = [ "agora/user/**" ]
+    includes = ["agora/user/**"]
     excludes = []
   }
 }
@@ -74,17 +76,17 @@ kamon {
     # Subscription patterns used to select which metrics will be pushed to StatsD. Note that first, metrics
     # collection for your desired entities must be activated under the kamon.metrics.filters settings.
     subscriptions {
-      histogram       = [ "**" ]
-      min-max-counter = [ "**" ]
-      gauge           = [ "**" ]
-      counter         = [ "**" ]
-      trace           = [ "**" ]
-      trace-segment   = [ "**" ]
-      akka-actor      = [ "**" ]
-      akka-dispatcher = [ "**" ]
-      akka-router     = [ "**" ]
-      system-metric   = [ "**" ]
-      http-server     = [ "**" ]
+      histogram = ["**"]
+      min-max-counter = ["**"]
+      gauge = ["**"]
+      counter = ["**"]
+      trace = ["**"]
+      trace-segment = ["**"]
+      akka-actor = ["**"]
+      akka-dispatcher = ["**"]
+      akka-router = ["**"]
+      system-metric = ["**"]
+      http-server = ["**"]
     }
 
     # FQCN of the implementation of `kamon.statsd.MetricKeyGenerator` to be instantiated and used for assigning

src/main/scala/org/broadinstitute/dsde/agora/server/Agora.scala

@@ -4,7 +4,7 @@ import com.typesafe.scalalogging.slf4j.LazyLogging
 import kamon.Kamon
 
 object ProductionAgora extends Agora {
-    start()
+  start()
 }
 
 class Agora() extends LazyLogging with App {

src/main/scala/org/broadinstitute/dsde/agora/server/AgoraConfig.scala

@@ -3,12 +3,14 @@ package org.broadinstitute.dsde.agora.server
 
 import com.typesafe.config.{Config, ConfigFactory}
 import net.ceedubs.ficus.Ficus._
+import net.ceedubs.ficus.readers.ArbitraryTypeReader._
 import org.broadinstitute.dsde.agora.server.model.AgoraEntityType
 import org.broadinstitute.dsde.agora.server.model.AgoraEntityType.EntityType
 import org.broadinstitute.dsde.agora.server.webservice.routes.{AgoraDirectives, MockAgoraDirectives, OpenIdConnectDirectives}
-import scala.slick.jdbc.JdbcBackend.Database
+import slick.jdbc.JdbcBackend.Database
 
 object AgoraConfig {
+
   private val config: Config = ConfigFactory.load()
 
   // Environments
@@ -54,7 +56,10 @@ object AgoraConfig {
 
   // Agora
   private lazy val embeddedUrlPort = config.as[Option[Int]]("embeddedUrl.port")
-  private lazy val embeddedUrlPortStr = embeddedUrlPort match { case None => "" case x: Some[Int] => ":" + x.get }
+  private lazy val embeddedUrlPortStr = embeddedUrlPort match {
+    case None => ""
+    case x: Some[Int] => ":" + x.get
+  }
   private lazy val baseUrl = scheme + "://" + host + embeddedUrlPortStr + "/"
   private lazy val scheme = config.as[Option[String]]("webservice.scheme").getOrElse("http")
   lazy val host = config.as[Option[String]]("webservice.host").getOrElse("localhost")
@@ -68,8 +73,8 @@ object AgoraConfig {
   lazy val kamonInstrumentation = config.as[Option[Boolean]]("kamon.instrumentation").getOrElse(true)
 
   // Mongo
-  lazy val mongoDbHost = config.as[Option[String]]("mongodb.host").getOrElse("localhost")
-  lazy val mongoDbPort = config.as[Option[Int]]("mongodb.port").getOrElse(27017)
+  lazy val mongoDbHosts = config.as[List[String]]("mongodb.hosts")
+  lazy val mongoDbPorts = config.as[List[Int]]("mongodb.ports")
   lazy val mongoDbUser = config.as[Option[String]]("mongodb.user")
   lazy val mongoDbPassword = config.as[Option[String]]("mongodb.password")
   lazy val mongoDbDatabase = config.as[Option[String]]("mongodb.db").getOrElse("agora")

src/main/scala/org/broadinstitute/dsde/agora/server/dataaccess/mongo/AgoraMongoClient.scala

@@ -58,7 +58,9 @@ object AgoraMongoClient {
   }
 
   private def getMongoClient: MongoClient = {
-    val server = new ServerAddress(AgoraConfig.mongoDbHost, AgoraConfig.mongoDbPort)
+    val serverList = for{ (host, port) <- AgoraConfig.mongoDbHosts zip AgoraConfig.mongoDbPorts } yield {
+      new ServerAddress(host, port)
+    }
 
     val user: Option[String] = AgoraConfig.mongoDbUser
     val password: Option[String] = AgoraConfig.mongoDbPassword
@@ -70,7 +72,7 @@ object AgoraMongoClient {
           AgoraConfig.mongoDbDatabase,
           userPassword.toCharArray
         )
-        MongoClient(server, List(credentials))
+        MongoClient(serverList, List(credentials))
       case _ =>
         MongoClient()
     }

src/main/scala/org/broadinstitute/dsde/agora/server/dataaccess/mongo/EmbeddedMongo.scala

@@ -11,7 +11,7 @@ object EmbeddedMongo extends MongoEmbedDatabase {
   def startMongo() = {
     println(s"Starting embedded mongo db instance.")
     if (mongodProps == null || !mongodProps.mongodProcess.isProcessRunning) {
-      mongodProps = mongoStart(port = AgoraConfig.mongoDbPort, version = Version.V2_7_1)
+      mongodProps = mongoStart(port = 27017, version = Version.V2_7_1)
     }
   }