diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-12-09 11:19:59 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-12-09 11:19:59 -0800 |
| commit | 3824b6e976317a4426daca2ce2de77e89550a78c (patch) | |
| tree | 24f0871fec9cba9dc66329012054832b49ff9419 /src | |
| parent | 179e6febd237ea387a0075f405a503e841d1a721 (diff) | |
| parent | 5efe9255c0f879f555fc9118e833bee513b14622 (diff) | |
Merge github.com:grpc/grpc into connectivity-state
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/surface/channel.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 859197412b..14fe97c30d 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -113,7 +113,7 @@ grpc_channel *grpc_channel_create_from_filters( } } else if (0 == strcmp(args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) { if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "%s: must be an string", + gpr_log(GPR_ERROR, "%s ignored: it must be a string", GRPC_ARG_DEFAULT_AUTHORITY); } else { if (channel->default_authority) { @@ -126,13 +126,14 @@ grpc_channel *grpc_channel_create_from_filters( } else if (0 == strcmp(args->args[i].key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG)) { if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "%s: must be an string", + gpr_log(GPR_ERROR, "%s ignored: it must be a string", GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); } else { if (channel->default_authority) { /* other ways of setting this (notably ssl) take precedence */ - gpr_log(GPR_ERROR, "%s: default host already set some other way", - GRPC_ARG_DEFAULT_AUTHORITY); + gpr_log(GPR_ERROR, + "%s ignored: default host already set some other way", + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); } else { channel->default_authority = grpc_mdelem_from_strings( ":authority", args->args[i].value.string); |