diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-22 10:20:04 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-22 10:20:04 -0700 |
| commit | 701951f635b2fa83f114c4e02bee287a56416db5 (patch) | |
| tree | b779252e2fc4a451d8268f00acf760148878eb6f /src/ruby/lib | |
| parent | bbc20b59f8650950cfe6dbf42c1eb0fe12945ca4 (diff) | |
| parent | e61aab26511db51975649bddb6a63d871a5cbeb3 (diff) | |
Merge pull request #7800 from apolcyn/dont_catch_load_error
Dont catch load error when loading grpc lib in ruby gem
Diffstat (limited to 'src/ruby/lib')
| -rw-r--r-- | src/ruby/lib/grpc/grpc.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/ruby/lib/grpc/grpc.rb b/src/ruby/lib/grpc/grpc.rb index b60a828d66..f46710dc74 100644 --- a/src/ruby/lib/grpc/grpc.rb +++ b/src/ruby/lib/grpc/grpc.rb @@ -28,7 +28,12 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. begin - require_relative "#{RUBY_VERSION.sub(/\.\d$/, '')}/grpc_c" -rescue LoadError - require_relative 'grpc_c' + ruby_version_dirname = /(\d+\.\d+)/.match(RUBY_VERSION).to_s + distrib_lib_dir = File.expand_path(ruby_version_dirname, + File.dirname(__FILE__)) + if File.directory?(distrib_lib_dir) + require_relative "#{distrib_lib_dir}/grpc_c" + else + require_relative 'grpc_c' + end end |