diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-03-08 14:12:18 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-03-08 14:12:18 -0800 |
| commit | 81932891af86bb844999dfe1ca70c68ff30c0a5d (patch) | |
| tree | 63ded1f25ffebab65f58f887baa8b378de515b5f /examples | |
| parent | 8c3d9943f6061c9c2370ab7e165cb9219adc7a02 (diff) | |
| parent | 0e67d191267aa9bb641bbeaf11246878c3521e75 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into codegen_lib
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cpp/README.md | 2 | ||||
| -rw-r--r-- | examples/php/README.md | 10 | ||||
| -rw-r--r-- | examples/python/route_guide/route_guide_server.py | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/examples/cpp/README.md b/examples/cpp/README.md index e4b0eb698b..d93cbacf7b 100644 --- a/examples/cpp/README.md +++ b/examples/cpp/README.md @@ -2,7 +2,7 @@ ## Installation -To install gRPC on your system, follow the instructions [here](../../INSTALL.md). +To install gRPC on your system, follow the instructions to build from source [here](../../INSTALL.md). This also installs the protocol buffer compiler `protoc` (if you don't have it already), and the C++ gRPC plugin for `protoc`. ## Hello C++ gRPC! diff --git a/examples/php/README.md b/examples/php/README.md index 8fb060863a..ea9ccb6790 100644 --- a/examples/php/README.md +++ b/examples/php/README.md @@ -4,16 +4,15 @@ gRPC in 3 minutes (PHP) PREREQUISITES ------------- -This requires PHP 5.5 or greater. +This requires `php` >=5.5, `phpize`, `pecl`, `phpunit` INSTALL ------- - - On Mac OS X, install [homebrew][]. Run the following command to install gRPC. + - Install the gRPC PHP extension ```sh - $ curl -fsSL https://goo.gl/getgrpc | bash -s php + $ [sudo] pecl install grpc-beta ``` - This will download and run the [gRPC install script][] and compile the gRPC PHP extension. - Clone this repository @@ -37,6 +36,7 @@ TRY IT! Please follow the instruction in [Node][] to run the server ``` $ cd examples/node + $ npm install $ nodejs greeter_server.js ``` @@ -58,7 +58,5 @@ TUTORIAL You can find a more detailed tutorial in [gRPC Basics: PHP][] -[homebrew]:http://brew.sh -[gRPC install script]:https://raw.githubusercontent.com/grpc/homebrew-grpc/master/scripts/install [Node]:https://github.com/grpc/grpc/tree/master/examples/node [gRPC Basics: PHP]:http://www.grpc.io/docs/tutorials/basic/php.html diff --git a/examples/python/route_guide/route_guide_server.py b/examples/python/route_guide/route_guide_server.py index f23b98bf36..f95b36b073 100644 --- a/examples/python/route_guide/route_guide_server.py +++ b/examples/python/route_guide/route_guide_server.py @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -128,7 +128,7 @@ def serve(): while True: time.sleep(_ONE_DAY_IN_SECONDS) except KeyboardInterrupt: - server.stop() + server.stop(0) if __name__ == '__main__': serve() |