diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-07-13 15:40:24 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-07-13 15:40:24 -0700 |
| commit | 22ac0d17c13a02ef4400700f5fe1af43c78d4931 (patch) | |
| tree | 5c45770eaedb68fdbe42b5e5f54ae47446f61402 /src/core/ext/transport/chttp2 | |
| parent | c8a8513d5911e99241ec0bb7b038d4344110cb41 (diff) | |
| parent | 8da7b1f779b36394008aad5ef40f49b03ce79c7b (diff) | |
Merge branch 'delayed-write' into grand-unified-closures
Diffstat (limited to 'src/core/ext/transport/chttp2')
| -rw-r--r-- | src/core/ext/transport/chttp2/client/secure/secure_channel_create.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c index 721ba82d8f..9acacbd92d 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c @@ -91,11 +91,13 @@ static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, connector *c = arg; grpc_closure *notify; gpr_mu_lock(&c->mu); + grpc_error *error = GRPC_ERROR_NONE; if (c->connecting_endpoint == NULL) { memset(c->result, 0, sizeof(*c->result)); gpr_mu_unlock(&c->mu); } else if (status != GRPC_SECURITY_OK) { - gpr_log(GPR_ERROR, "Secure handshake failed with error %d.", status); + error = grpc_error_set_int(GRPC_ERROR_CREATE("Secure handshake failed"), + GRPC_ERROR_INT_SECURITY_STATUS, status); memset(c->result, 0, sizeof(*c->result)); c->connecting_endpoint = NULL; gpr_mu_unlock(&c->mu); @@ -113,7 +115,7 @@ static void on_secure_handshake_done(grpc_exec_ctx *exec_ctx, void *arg, } notify = c->notify; c->notify = NULL; - grpc_exec_ctx_sched(exec_ctx, notify, GRPC_ERROR_NONE, NULL); + grpc_exec_ctx_sched(exec_ctx, notify, error, NULL); } static void on_initial_connect_string_sent(grpc_exec_ctx *exec_ctx, void *arg, |