From 0a7d85893c44fee9c76dc72448425a3ef5b7ab97 Mon Sep 17 00:00:00 2001
From: Tim Emiola <temiola@google.com>
Date: Mon, 26 Jan 2015 12:30:51 -0800
Subject: [PATCH] Updates rb_server.c to return the created port when it's
non-zero
---
src/ruby/ext/grpc/rb_server.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ruby/ext/grpc/rb_server.c b/src/ruby/ext/grpc/rb_server.c
index ef2a9f107b..436d006760 100644
--- a/src/ruby/ext/grpc/rb_server.c
+++ b/src/ruby/ext/grpc/rb_server.c
@@ -223,7 +223,7 @@ static VALUE grpc_rb_server_add_http2_port(int argc, VALUE *argv, VALUE self) {
VALUE port = Qnil;
VALUE is_secure = Qnil;
grpc_rb_server *s = NULL;
- int added_ok = 0;
+ int recvd_port = 0;
/* "11" == 1 mandatory args, 1 (is_secure) is optional */
rb_scan_args(argc, argv, "11", &port, &is_secure);
@@ -233,22 +233,22 @@ static VALUE grpc_rb_server_add_http2_port(int argc, VALUE *argv, VALUE self) {
rb_raise(rb_eRuntimeError, "closed!");
return Qnil;
} else if (is_secure == Qnil || TYPE(is_secure) != T_TRUE) {
- added_ok = grpc_server_add_http2_port(s->wrapped, StringValueCStr(port));
- if (added_ok == 0) {
+ recvd_port = grpc_server_add_http2_port(s->wrapped, StringValueCStr(port));
+ if (recvd_port == 0) {
rb_raise(rb_eRuntimeError,
"could not add port %s to server, not sure why",
StringValueCStr(port));
}
} else if (TYPE(is_secure) != T_FALSE) {
- added_ok =
+ recvd_port =
grpc_server_add_secure_http2_port(s->wrapped, StringValueCStr(port));
- if (added_ok == 0) {
+ if (recvd_port == 0) {
rb_raise(rb_eRuntimeError,
"could not add secure port %s to server, not sure why",
StringValueCStr(port));
}
}
- return Qnil;
+ return INT2NUM(recvd_port);
}
void Init_google_rpc_server() {
--
GitLab