Merge github.com:grpc/grpc into credit

changes/57/217557/1
Craig Tiller 10 years ago
commit 6eb087d6d7
  1. 6
      src/node/examples/pubsub/pubsub_demo.js
  2. 6
      src/node/examples/route_guide_client.js
  3. 10
      src/node/examples/route_guide_server.js

@ -27,6 +27,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
'use strict';
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
var GoogleAuth = require('googleauth'); var GoogleAuth = require('googleauth');
@ -270,7 +272,9 @@ function main(callback) {
if (require.main === module) { if (require.main === module) {
main(function(err) { main(function(err) {
if (err) throw err; if (err) {
throw err;
}
}); });
} }

@ -27,6 +27,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
'use strict';
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
var parseArgs = require('minimist'); var parseArgs = require('minimist');
@ -110,7 +112,9 @@ function runRecordRoute(callback) {
string: 'db_path' string: 'db_path'
}); });
fs.readFile(path.resolve(argv.db_path), function(err, data) { fs.readFile(path.resolve(argv.db_path), function(err, data) {
if (err) callback(err); if (err) {
callback(err);
}
var feature_list = JSON.parse(data); var feature_list = JSON.parse(data);
var num_points = 10; var num_points = 10;

@ -27,6 +27,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
'use strict';
var fs = require('fs'); var fs = require('fs');
var parseArgs = require('minimist'); var parseArgs = require('minimist');
var path = require('path'); var path = require('path');
@ -163,7 +165,7 @@ function recordRoute(call, callback) {
} }
/* For each point after the first, add the incremental distance from the /* For each point after the first, add the incremental distance from the
* previous point to the total distance value */ * previous point to the total distance value */
if (previous != null) { if (previous !== null) {
distance += getDistance(previous, point); distance += getDistance(previous, point);
} }
previous = point; previous = point;
@ -173,7 +175,7 @@ function recordRoute(call, callback) {
point_count: point_count, point_count: point_count,
feature_count: feature_count, feature_count: feature_count,
// Cast the distance to an integer // Cast the distance to an integer
distance: distance|0, distance: Math.floor(distance),
// End the timer // End the timer
elapsed_time: process.hrtime(start_time)[0] elapsed_time: process.hrtime(start_time)[0]
}); });
@ -240,7 +242,9 @@ if (require.main === module) {
string: 'db_path' string: 'db_path'
}); });
fs.readFile(path.resolve(argv.db_path), function(err, data) { fs.readFile(path.resolve(argv.db_path), function(err, data) {
if (err) throw err; if (err) {
throw err;
}
feature_list = JSON.parse(data); feature_list = JSON.parse(data);
routeServer.listen(); routeServer.listen();
}); });

Loading…
Cancel
Save