diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-05 23:32:00 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-06 00:26:08 +0000 |
| commit | 4c5a7cac411b30b9b4bd3ca067efcc9f3719b0ea (patch) | |
| tree | 2e09c62b854357bbb1c8d433898d004e3f3995a5 /configd | |
| parent | b84ef936b1cedce0b99f79e03b2fe25a8db5f7c3 (diff) | |
Reduce code visibility and include only what you need from config library.
Diffstat (limited to 'configd')
| -rw-r--r-- | configd/src/apps/sentinel/config-owner.cpp | 4 | ||||
| -rw-r--r-- | configd/src/apps/sentinel/config-owner.h | 2 | ||||
| -rw-r--r-- | configd/src/apps/sentinel/manager.h | 1 | ||||
| -rw-r--r-- | configd/src/apps/sentinel/model-owner.cpp | 6 | ||||
| -rw-r--r-- | configd/src/apps/sentinel/model-owner.h | 2 |
5 files changed, 5 insertions, 10 deletions
diff --git a/configd/src/apps/sentinel/config-owner.cpp b/configd/src/apps/sentinel/config-owner.cpp index 40fe5267dae..90ceb705dc7 100644 --- a/configd/src/apps/sentinel/config-owner.cpp +++ b/configd/src/apps/sentinel/config-owner.cpp @@ -1,9 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "config-owner.h" -#include <vespa/vespalib/util/exceptions.h> -#include <vespa/config/common/exceptions.h> -#include <string> +#include <vespa/config/subscription/configsubscriber.hpp> #include <vespa/log/log.h> LOG_SETUP(".sentinel.config-owner"); diff --git a/configd/src/apps/sentinel/config-owner.h b/configd/src/apps/sentinel/config-owner.h index a9083b553fa..2e44f8cd338 100644 --- a/configd/src/apps/sentinel/config-owner.h +++ b/configd/src/apps/sentinel/config-owner.h @@ -4,7 +4,7 @@ #include <vespa/config-sentinel.h> #include <vespa/config-model.h> -#include <vespa/config/config.h> +#include <vespa/config/subscription/configsubscriber.h> using cloud::config::SentinelConfig; diff --git a/configd/src/apps/sentinel/manager.h b/configd/src/apps/sentinel/manager.h index 8aaa406d578..48c95fe7a3d 100644 --- a/configd/src/apps/sentinel/manager.h +++ b/configd/src/apps/sentinel/manager.h @@ -8,7 +8,6 @@ #include "service.h" #include "state-api.h" #include <vespa/config-sentinel.h> -#include <vespa/config/config.h> #include <vespa/vespalib/net/state_server.h> #include <sys/types.h> #include <sys/select.h> diff --git a/configd/src/apps/sentinel/model-owner.cpp b/configd/src/apps/sentinel/model-owner.cpp index 8b1db60c73d..5dd7a033933 100644 --- a/configd/src/apps/sentinel/model-owner.cpp +++ b/configd/src/apps/sentinel/model-owner.cpp @@ -1,12 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "model-owner.h" -#include <vespa/vespalib/util/exceptions.h> #include <vespa/config/common/exceptions.h> -#include <string> -#include <chrono> -#include <vespa/log/log.h> +#include <vespa/config/subscription/configsubscriber.hpp> +#include <vespa/log/log.h> LOG_SETUP(".sentinel.model-owner"); using namespace std::chrono_literals; diff --git a/configd/src/apps/sentinel/model-owner.h b/configd/src/apps/sentinel/model-owner.h index 6c3038b4b55..762846e1ccd 100644 --- a/configd/src/apps/sentinel/model-owner.h +++ b/configd/src/apps/sentinel/model-owner.h @@ -3,7 +3,7 @@ #pragma once #include <vespa/config-model.h> -#include <vespa/config/config.h> +#include <vespa/config/subscription/configsubscriber.h> #include <optional> #include <mutex> |