fixed format string

reviewable/pr14228/r4
David Garcia Quintas 7 years ago
parent 75508a3f66
commit af7afbd4a1
  1. 10
      src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
  2. 10
      src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc

@ -85,7 +85,7 @@ typedef struct {
grpc_channel_args** target_result; grpc_channel_args** target_result;
/** current (fully resolved) result */ /** current (fully resolved) result */
grpc_channel_args* resolved_result; grpc_channel_args* resolved_result;
/** retry timer */ /** next resolution timer */
bool have_next_resolution_timer; bool have_next_resolution_timer;
grpc_timer next_resolution_timer; grpc_timer next_resolution_timer;
/** retry backoff state */ /** retry backoff state */
@ -348,11 +348,9 @@ static void dns_ares_maybe_start_resolving_locked(ares_dns_resolver* r) {
if (ms_until_next_resolution > 0) { if (ms_until_next_resolution > 0) {
const grpc_millis last_resolution_ago = const grpc_millis last_resolution_ago =
grpc_core::ExecCtx::Get()->Now() - r->last_resolution_timestamp; grpc_core::ExecCtx::Get()->Now() - r->last_resolution_timestamp;
gpr_log( gpr_log(GPR_DEBUG, "In cooldown from last resolution (from %" PRIdPTR
GPR_DEBUG, " ms ago). Will resolve again in %" PRIdPTR " ms",
"In cooldown from last resolution (from %ld ms ago). Will resolve " last_resolution_ago, ms_until_next_resolution);
"again in %ld ms",
last_resolution_ago, ms_until_next_resolution);
if (!r->have_next_resolution_timer) { if (!r->have_next_resolution_timer) {
r->have_next_resolution_timer = true; r->have_next_resolution_timer = true;
GRPC_RESOLVER_REF(&r->base, "next_resolution_timer_cooldown"); GRPC_RESOLVER_REF(&r->base, "next_resolution_timer_cooldown");

@ -67,7 +67,7 @@ typedef struct {
grpc_channel_args** target_result; grpc_channel_args** target_result;
/** current (fully resolved) result */ /** current (fully resolved) result */
grpc_channel_args* resolved_result; grpc_channel_args* resolved_result;
/** retry timer */ /** next resolution timer */
bool have_next_resolution_timer; bool have_next_resolution_timer;
grpc_timer next_resolution_timer; grpc_timer next_resolution_timer;
grpc_closure on_retry; grpc_closure on_retry;
@ -204,11 +204,9 @@ static void maybe_start_resolving_locked(dns_resolver* r) {
if (ms_until_next_resolution > 0) { if (ms_until_next_resolution > 0) {
const grpc_millis last_resolution_ago = const grpc_millis last_resolution_ago =
grpc_core::ExecCtx::Get()->Now() - r->last_resolution_timestamp; grpc_core::ExecCtx::Get()->Now() - r->last_resolution_timestamp;
gpr_log( gpr_log(GPR_DEBUG, "In cooldown from last resolution (from %" PRIdPTR
GPR_DEBUG, " ms ago). Will resolve again in %" PRIdPTR " ms",
"In cooldown from last resolution (from %ld ms ago). Will resolve " last_resolution_ago, ms_until_next_resolution);
"again in %ld ms",
last_resolution_ago, ms_until_next_resolution);
if (!r->have_next_resolution_timer) { if (!r->have_next_resolution_timer) {
r->have_next_resolution_timer = true; r->have_next_resolution_timer = true;
GRPC_RESOLVER_REF(&r->base, "next_resolution_timer_cooldown"); GRPC_RESOLVER_REF(&r->base, "next_resolution_timer_cooldown");

Loading…
Cancel
Save