This is an automated email from the ASF dual-hosted git repository.
japetrsn 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 92a64c2 Refactor Elasticsearch log store config name (#3791)
92a64c2 is described below
commit 92a64c291156a2cd3d6b304babc2a193a46d0699
Author: James Dubee <jwdu...@us.ibm.com>
AuthorDate: Thu Jun 21 12:02:25 2018 -0400
Refactor Elasticsearch log store config name (#3791)
---
common/scala/src/main/scala/whisk/core/WhiskConfig.scala | 2 +-
.../scala/whisk/core/containerpool/logging/ElasticSearchLogStore.scala | 2 +-
2 files changed, 2 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 7009029..a239aa7 100644
--- a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
+++ b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
@@ -237,7 +237,7 @@ object ConfigKeys {
val logStore = "whisk.logstore"
val splunk = s"$logStore.splunk"
- val elasticSearch = s"$logStore.elasticsearch"
+ val logStoreElasticSearch = s"$logStore.elasticsearch"
val mesos = "whisk.mesos"
diff --git
a/common/scala/src/main/scala/whisk/core/containerpool/logging/ElasticSearchLogStore.scala
b/common/scala/src/main/scala/whisk/core/containerpool/logging/ElasticSearchLogStore.scala
index 3340204..e159741 100644
---
a/common/scala/src/main/scala/whisk/core/containerpool/logging/ElasticSearchLogStore.scala
+++
b/common/scala/src/main/scala/whisk/core/containerpool/logging/ElasticSearchLogStore.scala
@@ -57,7 +57,7 @@ class ElasticSearchLogStore(
httpFlow: Option[Flow[(HttpRequest, Promise[HttpResponse]),
(Try[HttpResponse], Promise[HttpResponse]), Any]] = None,
destinationDirectory: Path = Paths.get("logs"),
elasticSearchConfig: ElasticSearchLogStoreConfig =
- loadConfigOrThrow[ElasticSearchLogStoreConfig](ConfigKeys.elasticSearch))
+
loadConfigOrThrow[ElasticSearchLogStoreConfig](ConfigKeys.logStoreElasticSearch))
extends DockerToActivationFileLogStore(system, destinationDirectory) {
// Schema of resultant logs from ES
