diff options
| author |  Yang Gao <yangg@google.com> | 2015-05-12 12:37:24 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-05-12 12:37:24 -0700 |
| commit | a468c36601dd5997580129bbd66b5ebed02521f8 (patch) | |
| tree | da9bbea984725d8c16653805836877de7442dc7e /src/node | |
| parent | 2e1229172c0b696fd77e400edecfb1ec562e31b2 (diff) | |
| parent | 9ec7f5ab81b98408b1cd4094ff536358528534c0 (diff) | |
Merge pull request #1493 from ctiller/churn-churn-churn-the-api-gently-down-the-stream
Completion queue binding for new requests API change
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/ext/server.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/node/ext/server.cc b/src/node/ext/server.cc index 3c2396b810..eb97f7348b 100644 --- a/src/node/ext/server.cc +++ b/src/node/ext/server.cc @@ -161,7 +161,7 @@ NAN_METHOD(Server::New) { grpc_server *wrapped_server; grpc_completion_queue *queue = CompletionQueueAsyncWorker::GetQueue(); if (args[0]->IsUndefined()) { - wrapped_server = grpc_server_create(queue, NULL); + wrapped_server = grpc_server_create(NULL); } else if (args[0]->IsObject()) { Handle<Object> args_hash(args[0]->ToObject()); Handle<Array> keys(args_hash->GetOwnPropertyNames()); @@ -190,11 +190,12 @@ NAN_METHOD(Server::New) { return NanThrowTypeError("Arg values must be strings"); } } - wrapped_server = grpc_server_create(queue, &channel_args); + wrapped_server = grpc_server_create(&channel_args); free(channel_args.args); } else { return NanThrowTypeError("Server expects an object"); } + grpc_server_register_completion_queue(wrapped_server, queue); Server *server = new Server(wrapped_server); server->Wrap(args.This()); NanReturnValue(args.This()); @@ -212,6 +213,7 @@ NAN_METHOD(Server::RequestCall) { grpc_call_error error = grpc_server_request_call( server->wrapped_server, &op->call, &op->details, &op->request_metadata, CompletionQueueAsyncWorker::GetQueue(), + CompletionQueueAsyncWorker::GetQueue(), new struct tag(new NanCallback(args[0].As<Function>()), ops.release(), shared_ptr<Resources>(nullptr))); if (error != GRPC_CALL_OK) { |