aboutsummaryrefslogtreecommitdiffstats
path: root/configutil
diff options
context:
space:
mode:
authorHåvard Pettersen <havardpe@oath.com>2019-01-17 13:58:49 +0000
committerHåvard Pettersen <havardpe@oath.com>2019-01-25 12:36:05 +0000
commit2ec8f7e3540b5dd4a5521b2f92c47de64ed01869 (patch)
treeea6d69d65ea79c2cc23c1f29cf91f8890a62dcc4 /configutil
parent02d24b5d24d8c3c3e97dbca86357881a5282601c (diff)
TLS support in vbench
- vbench/dumpurl applications explicitly run without encryption for now (config file/command line options should be added). - configstatus tool uses default encryption which will pick up local settings via environment where applicable.
Diffstat (limited to 'configutil')
-rw-r--r--configutil/src/lib/configstatus.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp
index 97af1a13486..920de52dad7 100644
--- a/configutil/src/lib/configstatus.cpp
+++ b/configutil/src/lib/configstatus.cpp
@@ -186,7 +186,8 @@ ConfigStatus::fetch_json(std::string configId, std::string host, int port,
std::string path, std::string &data)
{
MyHttpHandler myHandler(configId);
- bool ok = vbench::HttpClient::fetch(vbench::ServerSpec(host, port), path, myHandler);
+ auto crypto = vespalib::CryptoEngine::get_default();
+ bool ok = vbench::HttpClient::fetch(*crypto, vbench::ServerSpec(host, port), path, myHandler);
if (ok) {
data = myHandler.getJson();