aboutsummaryrefslogtreecommitdiffhomepage
path: root/examples
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-21 07:08:50 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-21 07:08:50 -0700
commit3448887c901aab0db2b44b73f7840ed5b30b3c7d (patch)
tree43cae1a2fbfa7513e15f0b6896802e8735ea0769 /examples
parent6c59e1682606b47651b21977481e762a3b88f028 (diff)
parentddd4d7f10f58bded28b47f09938780633c71fcaa (diff)
Merge github.com:grpc/grpc into filter-selection
Diffstat (limited to 'examples')
-rw-r--r--examples/cpp/helloworld/README.md2
-rw-r--r--examples/node/package.json5
-rwxr-xr-xexamples/ruby/route_guide/route_guide_client.rb4
3 files changed, 7 insertions, 4 deletions
diff --git a/examples/cpp/helloworld/README.md b/examples/cpp/helloworld/README.md
index 8e11f7cdf3..04283eabc3 100644
--- a/examples/cpp/helloworld/README.md
+++ b/examples/cpp/helloworld/README.md
@@ -207,7 +207,7 @@ completion queue to return the tag. The basic flow is
helloworld::Greeter::AsyncService service;
ServerBuilder builder;
builder.AddListeningPort("0.0.0.0:50051", InsecureServerCredentials());
- builder.RegisterAsyncService(&service);
+ builder.RegisterService(&service);
auto cq = builder.AddCompletionQueue();
auto server = builder.BuildAndStart();
```
diff --git a/examples/node/package.json b/examples/node/package.json
index 00ba428d96..d135df2464 100644
--- a/examples/node/package.json
+++ b/examples/node/package.json
@@ -2,6 +2,9 @@
"name": "grpc-examples",
"version": "0.1.0",
"dependencies": {
- "grpc": "0.13.0"
+ "async": "^1.5.2",
+ "grpc": "0.13.0",
+ "lodash": "^4.6.1",
+ "minimist": "^1.2.0"
}
}
diff --git a/examples/ruby/route_guide/route_guide_client.rb b/examples/ruby/route_guide/route_guide_client.rb
index 715a3c08c5..86dd1fe6ca 100755
--- a/examples/ruby/route_guide/route_guide_client.rb
+++ b/examples/ruby/route_guide/route_guide_client.rb
@@ -38,6 +38,7 @@ lib_dir = File.join(File.dirname(this_dir), 'lib')
$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
require 'grpc'
+require 'multi_json'
require 'route_guide_services'
include Routeguide
@@ -115,9 +116,8 @@ def run_record_route(stub, features)
p 'RecordRoute'
p '-----------'
points_on_route = 10 # arbitrary
- deadline = points_on_route # as delay b/w each is max 1 second
reqs = RandomRoute.new(features, points_on_route)
- resp = stub.record_route(reqs.each, deadline)
+ resp = stub.record_route(reqs.each)
p "summary: #{resp.inspect}"
end