From 86043d961d0b864638d51cadfe9f867eb11ea04f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= Date: Mon, 9 May 2022 18:09:37 +0200 Subject: [PATCH] crimson/osd: drop "using std::string" from main.cc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Radosław Zarzyński --- src/crimson/osd/main.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc index c2a3da6d0f839..9076a58f3097a 100644 --- a/src/crimson/osd/main.cc +++ b/src/crimson/osd/main.cc @@ -30,7 +30,6 @@ using namespace std::literals; namespace bpo = boost::program_options; -using std::string; seastar::logger& logger() { return crimson::get_logger(ceph_subsys_osd); @@ -70,7 +69,7 @@ using crimson::common::local_conf; seastar::future<> make_keyring() { - const auto path = local_conf().get_val("keyring"); + const auto path = local_conf().get_val("keyring"); return seastar::file_exists(path).then([path](bool exists) { KeyRing keyring; EntityName name{local_conf()->name}; @@ -189,9 +188,9 @@ int main(int argc, const char* argv[]) ("no-mon-config", "do not retrieve configuration from monitors on boot") ("prometheus_port", bpo::value()->default_value(0), "Prometheus port. Set to zero to disable") - ("prometheus_address", bpo::value()->default_value("0.0.0.0"), + ("prometheus_address", bpo::value()->default_value("0.0.0.0"), "Prometheus listening address") - ("prometheus_prefix", bpo::value()->default_value("osd"), + ("prometheus_prefix", bpo::value()->default_value("osd"), "Prometheus metrics prefix"); auto [config_proxy_args, seastar_n_early_args] = partition_args(argc, argv); @@ -262,9 +261,9 @@ int main(int argc, const char* argv[]) })); seastar::prometheus::config prom_config; - prom_config.prefix = config["prometheus_prefix"].as(); + prom_config.prefix = config["prometheus_prefix"].as(); seastar::prometheus::start(prom_server, prom_config).get(); - seastar::net::inet_address prom_addr(config["prometheus_address"].as()); + seastar::net::inet_address prom_addr(config["prometheus_address"].as()); prom_server.listen(seastar::socket_address{prom_addr, prom_port}) .handle_exception([=] (auto ep) { std::cerr << seastar::format("Could not start Prometheus API server on {}:{}: {}\n", -- 2.39.5