You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/11/30 03:30:33 UTC
[skywalking] branch master updated: StorageModuleElasticsearchProvider doesn't watch on TrustStorePath (#8205)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e2d1ff4 StorageModuleElasticsearchProvider doesn't watch on TrustStorePath (#8205)
e2d1ff4 is described below
commit e2d1ff435aa37c7ada3e5b62dae849e70df3696a
Author: Daniel Qian <ch...@gmail.com>
AuthorDate: Tue Nov 30 11:27:45 2021 +0800
StorageModuleElasticsearchProvider doesn't watch on TrustStorePath (#8205)
Ref https://github.com/apache/skywalking/discussions/8204
---
CHANGES.md | 1 +
.../plugin/elasticsearch/StorageModuleElasticsearchProvider.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index f37d0c7..b8aa70d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -62,6 +62,7 @@ Release Notes.
* Support using IoTDB as a new storage option.
* Add customized envoy ALS protocol receiver for satellite transmit batch data.
* Remove `logback` dependencies in IoTDB plugin.
+* Fix `StorageModuleElasticsearchProvider` doesn't watch on `trustStorePath`.
#### UI
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
index 4ca8daa..04fe917 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java
@@ -145,7 +145,7 @@ public class StorageModuleElasticsearchProvider extends ModuleProvider {
elasticSearchClient.setTrustStorePass(config.getTrustStorePass());
elasticSearchClient.connect();
}
- }, config.getSecretsManagementFile(), config.getTrustStorePass());
+ }, config.getSecretsManagementFile(), config.getTrustStorePath());
/*
* By leveraging the sync update check feature when startup.
*/