You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2018/01/08 16:20:23 UTC
[incubator-openwhisk] branch master updated: move PureConfig
strings to PureConfigKeys singleton (#3156)
This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 149f8d9 move PureConfig strings to PureConfigKeys singleton (#3156)
149f8d9 is described below
commit 149f8d948ed0db6293c1dc3be168e9322d71dd0a
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Mon Jan 8 11:20:20 2018 -0500
move PureConfig strings to PureConfigKeys singleton (#3156)
---
common/scala/src/main/scala/whisk/core/WhiskConfig.scala | 3 +++
.../src/main/scala/whisk/core/containerpool/docker/DockerClient.scala | 3 ++-
.../src/main/scala/whisk/core/containerpool/docker/RuncClient.scala | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
index 471ea67..c2094d6 100644
--- a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
+++ b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
@@ -244,4 +244,7 @@ object PureConfigKeys {
val whiskKafkaTopics = "whisk.kafka.topics"
val whiskDB = "whisk.db"
+
+ val whiskDockerTimeouts = "whisk.docker.timeouts"
+ val whiskRuncTimeouts = "whisk.runc.timeouts"
}
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
index 4ed631d..7cc1d27 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
@@ -36,6 +36,7 @@ import pureconfig.loadConfigOrThrow
import whisk.common.Logging
import whisk.common.LoggingMarkers
import whisk.common.TransactionId
+import whisk.core.PureConfigKeys
import whisk.core.containerpool.ContainerId
import whisk.core.containerpool.ContainerAddress
@@ -74,7 +75,7 @@ case class DockerClientTimeoutConfig(run: Duration,
*/
class DockerClient(dockerHost: Option[String] = None,
timeouts: DockerClientTimeoutConfig =
- loadConfigOrThrow[DockerClientTimeoutConfig]("whisk.docker.timeouts"))(
+ loadConfigOrThrow[DockerClientTimeoutConfig](PureConfigKeys.whiskDockerTimeouts))(
executionContext: ExecutionContext)(implicit log: Logging, as: ActorSystem)
extends DockerApi
with ProcessRunner {
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala b/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala
index 526bfc4..b8970ec 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/docker/RuncClient.scala
@@ -27,6 +27,7 @@ import whisk.common.TransactionId
import scala.util.Success
import whisk.common.LoggingMarkers
import whisk.common.Logging
+import whisk.core.PureConfigKeys
import akka.event.Logging.ErrorLevel
import pureconfig.loadConfigOrThrow
import whisk.core.containerpool.ContainerId
@@ -46,7 +47,7 @@ case class RuncClientTimeouts(pause: Duration, resume: Duration)
*
* You only need one instance (and you shouldn't get more).
*/
-class RuncClient(timeouts: RuncClientTimeouts = loadConfigOrThrow[RuncClientTimeouts]("whisk.runc.timeouts"))(
+class RuncClient(timeouts: RuncClientTimeouts = loadConfigOrThrow[RuncClientTimeouts](PureConfigKeys.whiskRuncTimeouts))(
executionContext: ExecutionContext)(implicit log: Logging, as: ActorSystem)
extends RuncApi
with ProcessRunner {
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].