diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-05-12 14:08:56 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-05-12 14:08:56 -0700 |
| commit | 54478f8562b812595b0d9102fc4703cdb04a627f (patch) | |
| tree | 818aacc26522a41fe7921e12e9adb360c9bc1183 /src/ruby/ext/grpc/rb_server.c | |
| parent | 6efa6eb5b35ca660651c78b03243366908a9d187 (diff) | |
| parent | a468c36601dd5997580129bbd66b5ebed02521f8 (diff) | |
Merge github.com:grpc/grpc into bye-bye-completion-queue-pie
Diffstat (limited to 'src/ruby/ext/grpc/rb_server.c')
| -rw-r--r-- | src/ruby/ext/grpc/rb_server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ruby/ext/grpc/rb_server.c b/src/ruby/ext/grpc/rb_server.c index 7db9e989de..0651c36c0b 100644 --- a/src/ruby/ext/grpc/rb_server.c +++ b/src/ruby/ext/grpc/rb_server.c @@ -123,7 +123,7 @@ static VALUE grpc_rb_server_init(VALUE self, VALUE cqueue, VALUE channel_args) { TypedData_Get_Struct(self, grpc_rb_server, &grpc_rb_server_data_type, wrapper); grpc_rb_hash_convert_to_channel_args(channel_args, &args); - srv = grpc_server_create(cq, &args); + srv = grpc_server_create(&args); if (args.args != NULL) { xfree(args.args); /* Allocated by grpc_rb_hash_convert_to_channel_args */ @@ -131,6 +131,7 @@ static VALUE grpc_rb_server_init(VALUE self, VALUE cqueue, VALUE channel_args) { if (srv == NULL) { rb_raise(rb_eRuntimeError, "could not create a gRPC server, not sure why"); } + grpc_server_register_completion_queue(srv, cq); wrapper->wrapped = srv; /* Add the cq as the server's mark object. This ensures the ruby cq can't be @@ -218,6 +219,7 @@ static VALUE grpc_rb_server_request_call(VALUE self, VALUE cqueue, err = grpc_server_request_call( s->wrapped, &call, &st.details, &st.md_ary, grpc_rb_get_wrapped_completion_queue(cqueue), + grpc_rb_get_wrapped_completion_queue(cqueue), ROBJECT(tag_new)); if (err != GRPC_CALL_OK) { grpc_request_call_stack_cleanup(&st); |