diff options
author | Arne Juul <arnej@verizonmedia.com> | 2021-06-11 13:24:18 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2021-06-11 13:24:51 +0000 |
commit | 714a924518bc5bef4f920899d3af96b56497eaf0 (patch) | |
tree | 6cea53d7a64aedeb4efda6680487dd5e9dc0f26c /configd/src/apps/sentinel/config-owner.cpp | |
parent | d32a461a49354922d81e55aabddbd13cc8902c30 (diff) |
keep naming convention
Diffstat (limited to 'configd/src/apps/sentinel/config-owner.cpp')
-rw-r--r-- | configd/src/apps/sentinel/config-owner.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configd/src/apps/sentinel/config-owner.cpp b/configd/src/apps/sentinel/config-owner.cpp index 074f7187537..4042eded24e 100644 --- a/configd/src/apps/sentinel/config-owner.cpp +++ b/configd/src/apps/sentinel/config-owner.cpp @@ -18,7 +18,7 @@ void ConfigOwner::subscribe(const std::string & configId, std::chrono::milliseconds timeout) { _sentinelHandle = _subscriber.subscribe<SentinelConfig>(configId, timeout); try { - _modelHandle =_modelSubscriber.subscribe<ModelConfig>("admin/model", timeout); + _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) { @@ -54,10 +54,10 @@ ConfigOwner::checkForConfigUpdate() { std::optional<ModelConfig> ConfigOwner::getModelConfig() { - if (_modelHandle && _modelSubscriber.nextGenerationNow()) { + 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(), _modelSubscriber.getGeneration()); + newModel->vespaVersion.c_str(), newModel->hosts.size(), _modelOwner.getGeneration()); _modelConfig = std::move(newModel); } } |