summaryrefslogtreecommitdiffstats
path: root/configd/src/apps/sentinel/config-owner.cpp
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2021-06-11 13:59:18 +0000
committerArne Juul <arnej@verizonmedia.com>2021-06-11 13:59:18 +0000
commiteb4a57b1b344cc4d83ab2ed2a5cc6c740dd774e4 (patch)
tree314044da7bd87eccce1171ed21099c20d8083d5c /configd/src/apps/sentinel/config-owner.cpp
parentb54d4da7d22b2e27618bb2bb8865429e01ddab95 (diff)
cleanup leftover code
Diffstat (limited to 'configd/src/apps/sentinel/config-owner.cpp')
-rw-r--r--configd/src/apps/sentinel/config-owner.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/configd/src/apps/sentinel/config-owner.cpp b/configd/src/apps/sentinel/config-owner.cpp
index 4042eded24e..665cf07d3e7 100644
--- a/configd/src/apps/sentinel/config-owner.cpp
+++ b/configd/src/apps/sentinel/config-owner.cpp
@@ -17,15 +17,6 @@ ConfigOwner::~ConfigOwner() = default;
void
ConfigOwner::subscribe(const std::string & configId, std::chrono::milliseconds timeout) {
_sentinelHandle = _subscriber.subscribe<SentinelConfig>(configId, timeout);
- try {
- _modelHandle =_modelOwner.subscribe<ModelConfig>("admin/model", timeout);
- } catch (ConfigTimeoutException & ex) {
- LOG(warning, "Timeout getting model config: %s [skipping connectivity checks]", ex.getMessage().c_str());
- } catch (InvalidConfigException& ex) {
- LOG(warning, "Invalid model config: %s [skipping connectivity checks]", ex.getMessage().c_str());
- } catch (ConfigRuntimeException& ex) {
- LOG(warning, "Runtime exception getting model config: %s [skipping connectivity checks]", ex.getMessage().c_str());
- }
}
void
@@ -38,7 +29,6 @@ ConfigOwner::doConfigure()
const auto & app = config.application;
LOG(config, "Sentinel got %zd service elements [tenant(%s), application(%s), instance(%s)] for config generation %" PRId64,
config.service.size(), app.tenant.c_str(), app.name.c_str(), app.instance.c_str(), _currGeneration);
- getModelConfig();
}
@@ -52,20 +42,4 @@ ConfigOwner::checkForConfigUpdate() {
return false;
}
-std::optional<ModelConfig>
-ConfigOwner::getModelConfig() {
- if (_modelHandle && _modelOwner.nextGenerationNow()) {
- if (auto newModel = _modelHandle->getConfig()) {
- LOG(config, "Sentinel got model info [version %s] for %zd hosts [config generation %" PRId64 "]",
- newModel->vespaVersion.c_str(), newModel->hosts.size(), _modelOwner.getGeneration());
- _modelConfig = std::move(newModel);
- }
- }
- if (_modelConfig) {
- return ModelConfig(*_modelConfig);
- } else {
- return {};
- }
-}
-
}