diff options
| author |  kpayson64 <kpayson@google.com> | 2016-07-18 10:35:54 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-18 10:35:54 -0700 |
| commit | f3f5c18e5ad14a35351f672181c51998b589cef3 (patch) | |
| tree | 1d4692d6f7d687ecfd6e5e91e585dcde5b1a5f43 /src | |
| parent | ad570d865485942e6cea824c9407fdf3229a4aeb (diff) | |
| parent | 8e769fdc954dcd23b41998afb39767005e5253c5 (diff) | |
Merge pull request #7284 from ewr/FixRubyTimeConversion
Fix arguments for calls to Ruby's `Time.at`
Diffstat (limited to 'src')
| -rw-r--r-- | src/ruby/ext/grpc/rb_grpc.c | 2 | ||||
| -rw-r--r-- | src/ruby/ext/grpc/rb_server.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c index 525508dbb1..17cd165a91 100644 --- a/src/ruby/ext/grpc/rb_grpc.c +++ b/src/ruby/ext/grpc/rb_grpc.c @@ -221,7 +221,7 @@ static VALUE grpc_rb_time_val_to_time(VALUE self) { time_const); real_time = gpr_convert_clock_type(*time_const, GPR_CLOCK_REALTIME); return rb_funcall(rb_cTime, id_at, 2, INT2NUM(real_time.tv_sec), - INT2NUM(real_time.tv_nsec)); + INT2NUM(real_time.tv_nsec / 1000)); } /* Invokes inspect on the ctime version of the time val. */ diff --git a/src/ruby/ext/grpc/rb_server.c b/src/ruby/ext/grpc/rb_server.c index bf26841fd2..2a6a246e67 100644 --- a/src/ruby/ext/grpc/rb_server.c +++ b/src/ruby/ext/grpc/rb_server.c @@ -218,7 +218,7 @@ static VALUE grpc_rb_server_request_call(VALUE self) { grpc_rb_sNewServerRpc, rb_str_new2(st.details.method), rb_str_new2(st.details.host), rb_funcall(rb_cTime, id_at, 2, INT2NUM(deadline.tv_sec), - INT2NUM(deadline.tv_nsec)), + INT2NUM(deadline.tv_nsec / 1000)), grpc_rb_md_ary_to_h(&st.md_ary), grpc_rb_wrap_call(call, call_queue), NULL); grpc_request_call_stack_cleanup(&st); |