Skip to content
Snippets Groups Projects
Commit 05c14809 authored by murgatroid99's avatar murgatroid99
Browse files

Updated client and server to use db from a variable path

parent ce02e0db
No related branches found
No related tags found
No related merge requests found
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
var parseArgs = require('minimist');
var path = require('path');
var _ = require('underscore'); var _ = require('underscore');
var grpc = require('..'); var grpc = require('..');
var examples = grpc.load(__dirname + '/route_guide.proto').examples; var examples = grpc.load(__dirname + '/route_guide.proto').examples;
...@@ -104,7 +106,10 @@ function runListFeatures(callback) { ...@@ -104,7 +106,10 @@ function runListFeatures(callback) {
* @param {function} callback Called when this demo is complete * @param {function} callback Called when this demo is complete
*/ */
function runRecordRoute(callback) { function runRecordRoute(callback) {
fs.readFile(__dirname + '/route_guide_db.json', function(err, data) { var argv = parseArgs(process.argv, {
string: 'db_path'
});
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);
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
var fs = require('fs'); var fs = require('fs');
var parseArgs = require('minimist');
var path = require('path');
var _ = require('underscore'); var _ = require('underscore');
var grpc = require('..'); var grpc = require('..');
var examples = grpc.load(__dirname + '/route_guide.proto').examples; var examples = grpc.load(__dirname + '/route_guide.proto').examples;
...@@ -234,7 +236,10 @@ if (require.main === module) { ...@@ -234,7 +236,10 @@ if (require.main === module) {
// If this is run as a script, start a server on an unused port // If this is run as a script, start a server on an unused port
var routeServer = getServer(); var routeServer = getServer();
routeServer.bind('0.0.0.0:50051'); routeServer.bind('0.0.0.0:50051');
fs.readFile(__dirname + '/route_guide_db.json', function(err, data) { var argv = parseArgs(process.argv, {
string: 'db_path'
});
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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment