diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-18 11:05:54 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-18 11:05:54 +0000 |
commit | 39443ba7ffe7966fb06555ef832f4eff3756c076 (patch) | |
tree | 5e0a2fd6ab79aa6be435551ea307be9750e69227 /configd | |
parent | 36df8bd3d9fd4ee60aadd04af89199a8bc504e68 (diff) |
Move state_server, metrivs and some all executors from staging_vespalib too vespalib.
Diffstat (limited to 'configd')
-rw-r--r-- | configd/src/apps/sentinel/env.h | 2 | ||||
-rw-r--r-- | configd/src/apps/sentinel/manager.h | 2 | ||||
-rw-r--r-- | configd/src/apps/sentinel/state-api.h | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/configd/src/apps/sentinel/env.h b/configd/src/apps/sentinel/env.h index 01531c425bf..ec3e201cf5e 100644 --- a/configd/src/apps/sentinel/env.h +++ b/configd/src/apps/sentinel/env.h @@ -8,7 +8,7 @@ #include "model-owner.h" #include "rpcserver.h" #include "state-api.h" -#include <vespa/vespalib/net/state_server.h> +#include <vespa/vespalib/net/http/state_server.h> namespace config::sentinel { diff --git a/configd/src/apps/sentinel/manager.h b/configd/src/apps/sentinel/manager.h index 48c95fe7a3d..ac2e2a56785 100644 --- a/configd/src/apps/sentinel/manager.h +++ b/configd/src/apps/sentinel/manager.h @@ -8,7 +8,7 @@ #include "service.h" #include "state-api.h" #include <vespa/config-sentinel.h> -#include <vespa/vespalib/net/state_server.h> +#include <vespa/vespalib/net/http/state_server.h> #include <sys/types.h> #include <sys/select.h> diff --git a/configd/src/apps/sentinel/state-api.h b/configd/src/apps/sentinel/state-api.h index 2cb2d381821..e00a0e0ba05 100644 --- a/configd/src/apps/sentinel/state-api.h +++ b/configd/src/apps/sentinel/state-api.h @@ -2,17 +2,15 @@ #pragma once -#include <vespa/vespalib/net/simple_health_producer.h> -#include <vespa/vespalib/net/simple_component_config_producer.h> +#include <vespa/vespalib/net/http/simple_health_producer.h> +#include <vespa/vespalib/net/http/simple_component_config_producer.h> #include <vespa/vespalib/metrics/simple_metrics.h> -namespace config { -namespace sentinel { +namespace config::sentinel { struct StateApi { vespalib::SimpleHealthProducer myHealth; vespalib::SimpleComponentConfigProducer myComponents; }; -} // namespace config::sentinel -} // namespace config +} |