mirror of https://github.com/grpc/grpc-node.git
Merge pull request #481 from murgatroid99/perf_test_fixes
Fix benchmark proto loading
This commit is contained in:
commit
61f969a1ba
|
|
@ -39,12 +39,12 @@ var genericService = require('./generic_service');
|
||||||
var grpc = require('../any_grpc').client;
|
var grpc = require('../any_grpc').client;
|
||||||
var protoLoader = require('../../packages/grpc-protobufjs');
|
var protoLoader = require('../../packages/grpc-protobufjs');
|
||||||
var protoPackage = protoLoader.loadSync(
|
var protoPackage = protoLoader.loadSync(
|
||||||
'src/proto/grpc/testing/services.proto',
|
'src/proto/grpc/testing/benchmark_service.proto',
|
||||||
{keepCase: true,
|
{keepCase: true,
|
||||||
defaults: true,
|
defaults: true,
|
||||||
enums: String,
|
enums: String,
|
||||||
oneofs: true,
|
oneofs: true,
|
||||||
include: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
|
includeDirs: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
|
||||||
var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
|
var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -33,12 +33,12 @@ var genericService = require('./generic_service');
|
||||||
var grpc = require('../any_grpc').server;
|
var grpc = require('../any_grpc').server;
|
||||||
var protoLoader = require('../../packages/grpc-protobufjs');
|
var protoLoader = require('../../packages/grpc-protobufjs');
|
||||||
var protoPackage = protoLoader.loadSync(
|
var protoPackage = protoLoader.loadSync(
|
||||||
'src/proto/grpc/testing/services.proto',
|
'src/proto/grpc/testing/benchmark_service.proto',
|
||||||
{keepCase: true,
|
{keepCase: true,
|
||||||
defaults: true,
|
defaults: true,
|
||||||
enums: String,
|
enums: String,
|
||||||
oneofs: true,
|
oneofs: true,
|
||||||
include: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
|
includeDirs: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
|
||||||
var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
|
var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,12 @@ var WorkerServiceImpl = require('./worker_service_impl');
|
||||||
var grpc = require('../any_grpc').server;
|
var grpc = require('../any_grpc').server;
|
||||||
var protoLoader = require('../../packages/grpc-protobufjs');
|
var protoLoader = require('../../packages/grpc-protobufjs');
|
||||||
var protoPackage = protoLoader.loadSync(
|
var protoPackage = protoLoader.loadSync(
|
||||||
'src/proto/grpc/testing/services.proto',
|
'src/proto/grpc/testing/worker_service.proto',
|
||||||
{keepCase: true,
|
{keepCase: true,
|
||||||
defaults: true,
|
defaults: true,
|
||||||
enums: String,
|
enums: String,
|
||||||
oneofs: true,
|
oneofs: true,
|
||||||
include: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
|
includeDirs: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
|
||||||
var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
|
var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
|
||||||
|
|
||||||
function runServer(port, benchmark_impl) {
|
function runServer(port, benchmark_impl) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue