Merge pull request #4514 from yang-g/master

hide a debug log under trace and fix two log levels
pull/4522/head
David G. Quintas 9 years ago
commit 2dd2e895d9
  1. 6
      src/core/transport/chttp2/frame_settings.c
  2. 4
      src/core/transport/chttp2_transport.c

@ -240,8 +240,10 @@ grpc_chttp2_parse_error grpc_chttp2_settings_parser_parse(
transport_parsing->initial_window_update = transport_parsing->initial_window_update =
(gpr_int64)parser->value - (gpr_int64)parser->value -
parser->incoming_settings[parser->id]; parser->incoming_settings[parser->id];
gpr_log(GPR_DEBUG, "adding %d for initial_window change", if (grpc_http_trace) {
(int)transport_parsing->initial_window_update); gpr_log(GPR_DEBUG, "adding %d for initial_window change",
(int)transport_parsing->initial_window_update);
}
} }
parser->incoming_settings[parser->id] = parser->value; parser->incoming_settings[parser->id] = parser->value;
if (grpc_http_trace) { if (grpc_http_trace) {

@ -348,7 +348,7 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
gpr_log(GPR_ERROR, "%s: must be an integer", gpr_log(GPR_ERROR, "%s: must be an integer",
GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_DECODER); GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_DECODER);
} else if (channel_args->args[i].value.integer < 0) { } else if (channel_args->args[i].value.integer < 0) {
gpr_log(GPR_DEBUG, "%s: must be non-negative", gpr_log(GPR_ERROR, "%s: must be non-negative",
GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_DECODER); GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_DECODER);
} else { } else {
push_setting(t, GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE, push_setting(t, GRPC_CHTTP2_SETTINGS_HEADER_TABLE_SIZE,
@ -360,7 +360,7 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
gpr_log(GPR_ERROR, "%s: must be an integer", gpr_log(GPR_ERROR, "%s: must be an integer",
GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_ENCODER); GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_ENCODER);
} else if (channel_args->args[i].value.integer < 0) { } else if (channel_args->args[i].value.integer < 0) {
gpr_log(GPR_DEBUG, "%s: must be non-negative", gpr_log(GPR_ERROR, "%s: must be non-negative",
GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_ENCODER); GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_ENCODER);
} else { } else {
grpc_chttp2_hpack_compressor_set_max_usable_size( grpc_chttp2_hpack_compressor_set_max_usable_size(

Loading…
Cancel
Save