diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-01-29 10:57:42 -0800 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-01-29 10:57:42 -0800 |
commit | eecd9e2d23261f953c23dd8381b2736e1c0c230e (patch) | |
tree | e22f9b340c26645f92876736a7cd726302c31216 /src | |
parent | a7d7aeba659a3e05f7b3b2baf3bd72978413c9ac (diff) | |
parent | 2fedbeccaa2b64516e9fabcba572c91d25f66f17 (diff) |
Merge pull request #4960 from vjpai/kill_host
Remove host option from ServerConfig proto
Diffstat (limited to 'src')
-rw-r--r-- | src/node/performance/benchmark_server.js | 2 | ||||
-rw-r--r-- | src/node/performance/worker_service_impl.js | 4 | ||||
-rw-r--r-- | src/proto/grpc/testing/control.proto | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/node/performance/benchmark_server.js b/src/node/performance/benchmark_server.js index ba61e52ba1..e48acd48f5 100644 --- a/src/node/performance/benchmark_server.js +++ b/src/node/performance/benchmark_server.js @@ -76,7 +76,7 @@ function unaryCall(call, callback) { */ function streamingCall(call) { call.on('data', function(value) { - var payload = {body: zeroBuffer(value.repsonse_size)}; + var payload = {body: zeroBuffer(value.response_size)}; call.write({payload: payload}); }); call.on('end', function() { diff --git a/src/node/performance/worker_service_impl.js b/src/node/performance/worker_service_impl.js index 8841ae13c3..99ae32127e 100644 --- a/src/node/performance/worker_service_impl.js +++ b/src/node/performance/worker_service_impl.js @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -99,7 +99,7 @@ exports.runServer = function runServer(call) { var stats; switch (request.argtype) { case 'setup': - server = new BenchmarkServer(request.setup.host, request.setup.port, + server = new BenchmarkServer('[::]', request.setup.port, request.setup.security_params); server.start(); stats = server.mark(); diff --git a/src/proto/grpc/testing/control.proto b/src/proto/grpc/testing/control.proto index 7ba6f9856f..2f352e652f 100644 --- a/src/proto/grpc/testing/control.proto +++ b/src/proto/grpc/testing/control.proto @@ -127,8 +127,6 @@ message ClientArgs { message ServerConfig { ServerType server_type = 1; SecurityParams security_params = 2; - // Host on which to listen. - string host = 3; // Port on which to listen. Zero means pick unused port. int32 port = 4; // Only for async server. Number of threads used to serve the requests. |