diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-05-23 13:41:32 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-05-23 13:41:32 -0700 |
| commit | 2939e2f9f78a2008a665ea2ab2c7a102c04bdfa7 (patch) | |
| tree | ea964a039b091c60e4d2ec0d24ab8dbc5678bd74 /src/ruby/qps | |
| parent | 74cb8f5e6d7be529769f95790938e770fc2074f5 (diff) | |
Update ruby perf code with keyword args changes
Diffstat (limited to 'src/ruby/qps')
| -rw-r--r-- | src/ruby/qps/client.rb | 4 | ||||
| -rw-r--r-- | src/ruby/qps/server.rb | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ruby/qps/client.rb b/src/ruby/qps/client.rb index d04f707479..917b01271e 100644 --- a/src/ruby/qps/client.rb +++ b/src/ruby/qps/client.rb @@ -66,8 +66,10 @@ class BenchmarkClient cred = GRPC::Core::ChannelCredentials.new() end if config.security_params.server_host_override - opts[GRPC::Core::Channel::SSL_TARGET] = + channel_args = {} + channel_args[GRPC::Core::Channel::SSL_TARGET] = config.security_params.server_host_override + opts[:channel_args] = channel_args end else cred = :this_channel_is_insecure diff --git a/src/ruby/qps/server.rb b/src/ruby/qps/server.rb index f05fbbdaaf..52a89ce847 100644 --- a/src/ruby/qps/server.rb +++ b/src/ruby/qps/server.rb @@ -75,13 +75,14 @@ class BenchmarkServer @port = @server.add_http2_port("0.0.0.0:" + port.to_s, cred) @server.handle(BenchmarkServiceImpl.new) @start_time = Time.now - Thread.new { + t = Thread.new { @server.run } + t.abort_on_exception end def mark(reset) s = Grpc::Testing::ServerStats.new(time_elapsed: - (Time.now-@start_time).to_f) + (Time.now-@start_time).to_f) @start_time = Time.now if reset s end |