diff --git a/service/storage_service.cc b/service/storage_service.cc index 39e8cc81f6..6727a045f0 100644 --- a/service/storage_service.cc +++ b/service/storage_service.cc @@ -365,7 +365,7 @@ future<> storage_service::bootstrap(std::unordered_set tokens) { } void storage_service::handle_state_bootstrap(inet_address endpoint) { - ss_debug("SS::handle_state_bootstrap endpoint=%s\n", endpoint); + logger.debug("SS::handle_state_bootstrap endpoint={}", endpoint); // explicitly check for TOKENS, because a bootstrapping node might be bootstrapping in legacy mode; that is, not using vnodes and no token specified auto tokens = get_tokens_for(endpoint); @@ -397,7 +397,7 @@ void storage_service::handle_state_bootstrap(inet_address endpoint) { } void storage_service::handle_state_normal(inet_address endpoint) { - ss_debug("SS::handle_state_bootstrap endpoint=%s\n", endpoint); + logger.debug("SS::handle_state_bootstrap endpoint={}", endpoint); auto tokens = get_tokens_for(endpoint); auto& gossiper = gms::get_local_gossiper(); @@ -612,10 +612,10 @@ void storage_service::handle_state_removing(inet_address endpoint, std::vector pieces; boost::split(pieces, value.value, boost::is_any_of(sstring(versioned_value::DELIMITER_STR))); @@ -702,7 +702,7 @@ void storage_service::on_restart(gms::inet_address endpoint, gms::endpoint_state } void storage_service::do_update_system_peers_table(gms::inet_address endpoint, const application_state& state, const versioned_value& value) { - ss_debug("storage_service:: Update ep=%s, state=%d, value=%s\n", endpoint, int(state), value.value); + logger.debug("storage_service:: Update ep={}, state={}, value={}", endpoint, int(state), value.value); if (state == application_state::RELEASE_VERSION) { auto col = sstring("release_version"); db::system_keyspace::update_peer_info(endpoint, col, value.value).then_wrapped([col, endpoint] (auto&& f) { @@ -772,12 +772,12 @@ sstring storage_service::get_application_state_value(inet_address endpoint, appl std::unordered_set storage_service::get_tokens_for(inet_address endpoint) { auto tokens_string = get_application_state_value(endpoint, application_state::TOKENS); - ss_debug("endpoint=%s, tokens_string=%s\n", endpoint, tokens_string); + logger.debug("endpoint={}, tokens_string={}", endpoint, tokens_string); std::vector tokens; std::unordered_set ret; boost::split(tokens, tokens_string, boost::is_any_of(";")); for (auto str : tokens) { - ss_debug("token=%s\n", str); + logger.debug("token={}", str); sstring_view sv(str); bytes b = from_hex(sv); ret.emplace(token::kind::key, b); diff --git a/service/storage_service.hh b/service/storage_service.hh index 6af3cb54f3..1dfc9342ca 100644 --- a/service/storage_service.hh +++ b/service/storage_service.hh @@ -37,12 +37,6 @@ namespace service { -template -void ss_debug(const char* fmt, Args&&... args) { -#if SS_DEBUG - print(fmt, std::forward(args)...); -#endif -} /** * This abstraction contains the token/identifier of this node * on the identifier space. This token gets gossiped around.