diff options
author | Jakob Odersky <jakob@driver.xyz> | 2018-09-12 11:46:08 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@driver.xyz> | 2018-09-12 14:17:39 -0700 |
commit | ed4fe6231bcefd7c0297f385f07a7e1bbcdd1166 (patch) | |
tree | 4916c5da422cf5425378e9ef9b9b8ea5a49a89b9 | |
parent | e103f1f1c2bcfafb82fc29fa8fffed26df6b5cbe (diff) | |
download | driver-core-ed4fe6231bcefd7c0297f385f07a7e1bbcdd1166.tar.gz driver-core-ed4fe6231bcefd7c0297f385f07a7e1bbcdd1166.tar.bz2 driver-core-ed4fe6231bcefd7c0297f385f07a7e1bbcdd1166.zip |
Move out service discovery
-rw-r--r-- | src/main/scala/xyz/driver/core/init/CloudServices.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/init/CloudServices.scala b/src/main/scala/xyz/driver/core/init/CloudServices.scala index a6a477a..857dd4c 100644 --- a/src/main/scala/xyz/driver/core/init/CloudServices.scala +++ b/src/main/scala/xyz/driver/core/init/CloudServices.scala @@ -5,7 +5,7 @@ import java.nio.file.Paths import xyz.driver.core.messaging.{CreateOnDemand, GoogleBus, QueueBus, StreamBus} import xyz.driver.core.reporting._ -import xyz.driver.core.rest.{DnsDiscovery, ServiceDescriptor} +import xyz.driver.core.rest.DnsDiscovery import xyz.driver.core.storage.{BlobStorage, FileSystemBlobStorage, GcsBlobStorage} import scala.collection.JavaConverters._ @@ -19,8 +19,9 @@ trait CloudServices extends AkkaBootable { self => def platform: Platform = Platform.current /** Service discovery for the current platform. + * @group utilities */ - private lazy val discovery: DnsDiscovery = { + lazy val discovery: DnsDiscovery = { def getOverrides(): Map[String, String] = { val block = config.getObject("services.dev-overrides").unwrapped().asScala for ((key, value) <- block) yield { @@ -37,8 +38,6 @@ trait CloudServices extends AkkaBootable { self => new DnsDiscovery(clientTransport, overrides) } - def discover[A: ServiceDescriptor]: A = discovery.discover[A] - /* TODO: this reporter uses the platform to determine if JSON logging should be enabled. * Since the default logger uses slf4j, its settings must be specified before a logger * is first accessed. This in turn leads to somewhat convoluted code, |