aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-05-11 10:48:54 -0700
committerGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-05-11 10:48:54 -0700
commit0840b857726323b6cd274662aa166164528de521 (patch)
tree66e905698bd07d3a2b82fcfbd83d1404e236e203
parent331f05cb2cbf3882ede95b9d0a39334f0926fd44 (diff)
parent3080ede82c5ac0ba8b5df80f180c1b4aaef9b4ae (diff)
Merge pull request #6500 from murgatroid99/ruby_user_agent
Allow Ruby client code to set a user agent
-rw-r--r--src/ruby/lib/grpc/generic/client_stub.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ruby/lib/grpc/generic/client_stub.rb b/src/ruby/lib/grpc/generic/client_stub.rb
index 68e167a69f..12946fe819 100644
--- a/src/ruby/lib/grpc/generic/client_stub.rb
+++ b/src/ruby/lib/grpc/generic/client_stub.rb
@@ -49,7 +49,12 @@ module GRPC
fail(TypeError, '!Channel') unless alt_chan.is_a?(Core::Channel)
return alt_chan
end
- kw['grpc.primary_user_agent'] = "grpc-ruby/#{VERSION}"
+ if kw['grpc.primary_user_agent'].nil?
+ kw['grpc.primary_user_agent'] = ''
+ else
+ kw['grpc.primary_user_agent'] += ' '
+ end
+ kw['grpc.primary_user_agent'] += "grpc-ruby/#{VERSION}"
unless creds.is_a?(Core::ChannelCredentials) || creds.is_a?(Symbol)
fail(TypeError, '!ChannelCredentials or Symbol')
end