Skip to content
Snippets Groups Projects
Commit 8e769fdc authored by Eric Richardson's avatar Eric Richardson
Browse files

Fix arguments for calls to Ruby's `Time.at`

`Time.at` takes microseconds as a second arg, not nanoseconds. Fixes
conversion of deadline time on the server-side.
parent 2f17797c
No related branches found
No related tags found
No related merge requests found
...@@ -220,7 +220,7 @@ static VALUE grpc_rb_time_val_to_time(VALUE self) { ...@@ -220,7 +220,7 @@ static VALUE grpc_rb_time_val_to_time(VALUE self) {
time_const); time_const);
real_time = gpr_convert_clock_type(*time_const, GPR_CLOCK_REALTIME); real_time = gpr_convert_clock_type(*time_const, GPR_CLOCK_REALTIME);
return rb_funcall(rb_cTime, id_at, 2, INT2NUM(real_time.tv_sec), 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. */ /* Invokes inspect on the ctime version of the time val. */
......
...@@ -218,7 +218,7 @@ static VALUE grpc_rb_server_request_call(VALUE self) { ...@@ -218,7 +218,7 @@ static VALUE grpc_rb_server_request_call(VALUE self) {
grpc_rb_sNewServerRpc, rb_str_new2(st.details.method), grpc_rb_sNewServerRpc, rb_str_new2(st.details.method),
rb_str_new2(st.details.host), rb_str_new2(st.details.host),
rb_funcall(rb_cTime, id_at, 2, INT2NUM(deadline.tv_sec), 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), grpc_rb_md_ary_to_h(&st.md_ary), grpc_rb_wrap_call(call, call_queue),
NULL); NULL);
grpc_request_call_stack_cleanup(&st); grpc_request_call_stack_cleanup(&st);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment