gruf 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fbcc0f1b3083a00fa413c9d16bdb126e04a37f5a1cdee3ae05573698e4deb67
-  data.tar.gz: 5327ddd7497e82d991eba1a7ce37e35c62e9810ae5803227563fa4e6ebee31b4
+  metadata.gz: afe8122fa755293990e7fc3ba4209e4629fb70eb9ff77f414e1069c769b8ba98
+  data.tar.gz: 76def29dfe24d045328f02f78fbc6b4f0f040df7519fe5879b4cd4d163496b6d
 SHA512:
-  metadata.gz: 6ab52c50feb431404c3cbde8b67de6f456b8310ce21a857d9ffcc4b820055773c908d3329a0b965c5b3459583658103f5be7bf3debc5acea541d84b516937c2c
-  data.tar.gz: 898363f243233aace1aeffd4163b996bd280462a2c444db4c75ad472010ac7bc99f50d5945a2126380a6676a80daeb72b401b94c97010d6920dc796c4b661b2b
+  metadata.gz: 49d07b632e0b22b8ed36877e133d85b9098998e6ba0cc46ad2c320611e8b4aa35b3e7b00b8df5250eeebc238cbc0e441643db5bbc77634af6933991990284572
+  data.tar.gz: cb5d1ae09b466b84a11c92763219804a456ef0735ce69053dabcbf0f419802e4e917a711947eeb1f7b26c156263c226b0b33bce1b45cc2753c138d9e053d4bfe

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.13.0
+
+- Remove server mutex handling in deference to core grpc signal handling
+- Relax grpc pin as upstream regression is fixed
+
 ### 2.12.0
 
 - Fixed interceptor order to be FIFO as documented, instead of FILO (fixes #139)

data/README.md

@@ -1,6 +1,6 @@
 # gruf - gRPC Ruby Framework
 
-[![CircleCI](https://circleci.com/gh/bigcommerce/gruf/tree/main.svg?style=svg)](https://circleci.com/gh/bigcommerce/gruf/tree/main) [![Gem Version](https://badge.fury.io/rb/gruf.svg)](https://badge.fury.io/rb/gruf) [![Documentation](https://inch-ci.org/github/bigcommerce/gruf.svg?branch=main)](https://inch-ci.org/github/bigcommerce/gruf?branch=main)
+[![CircleCI](https://circleci.com/gh/bigcommerce/gruf/tree/main.svg?style=svg)](https://circleci.com/gh/bigcommerce/gruf/tree/main) [![Gem Version](https://badge.fury.io/rb/gruf.svg)](https://badge.fury.io/rb/gruf) [![Documentation](https://inch-ci.org/github/bigcommerce/gruf.svg?branch=main)](https://inch-ci.org/github/bigcommerce/gruf?branch=main) [![Maintainability](https://api.codeclimate.com/v1/badges/4a8e9269f99100aeb7cb/maintainability)](https://codeclimate.com/github/bigcommerce/gruf/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/4a8e9269f99100aeb7cb/test_coverage)](https://codeclimate.com/github/bigcommerce/gruf/test_coverage)
 
 gruf is a Ruby framework that wraps the [gRPC Ruby library](https://github.com/grpc/grpc/tree/master/src/ruby) to
 provide a more streamlined integration into Ruby and Ruby on Rails applications.

data/gruf.gemspec

@@ -59,8 +59,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '> 4'
   spec.add_runtime_dependency 'concurrent-ruby', '> 1'
   spec.add_runtime_dependency 'e2mmap', '>= 0.1'
-  spec.add_runtime_dependency 'grpc', '~> 1.10', '<= 1.41.0'
-  spec.add_runtime_dependency 'grpc-tools', '~> 1.10', '<= 1.41.0'
+  spec.add_runtime_dependency 'grpc', '~> 1.10'
+  spec.add_runtime_dependency 'grpc-tools', '~> 1.10'
   spec.add_runtime_dependency 'json', '>= 2.3'
   spec.add_runtime_dependency 'slop', '>= 4.6'
   spec.add_runtime_dependency 'thwait', '>= 0.1'

data/lib/gruf/server.rb

@@ -23,6 +23,8 @@ module Gruf
   class Server
     class ServerAlreadyStartedError < StandardError; end
 
+    KILL_SIGNALS = %w[INT TERM QUIT].freeze
+
     include Gruf::Loggable
 
     # @!attribute [r] port
@@ -43,10 +45,6 @@ module Gruf
       @interceptors = Gruf::Interceptors::Registry.new unless @interceptors.is_a?(Gruf::Interceptors::Registry)
       @services = []
       @started = false
-      @stop_server = false
-      @stop_server_cv = ConditionVariable.new
-      @stop_server_mu = Monitor.new
-      @server_mu = Monitor.new
       @hostname = opts.fetch(:hostname, Gruf.server_binding_url)
       @event_listener_proc = opts.fetch(:event_listener_proc, Gruf.event_listener_proc)
       setup
@@ -56,30 +54,28 @@ module Gruf
     # @return [GRPC::RpcServer] The GRPC server running
     #
     def server
-      @server_mu.synchronize do
-        @server ||= begin
-          # For backward compatibility, we allow these options to be passed directly
-          # in the Gruf::Server options, or via Gruf.rpc_server_options.
-          server_options = {
-            pool_size: options.fetch(:pool_size, Gruf.rpc_server_options[:pool_size]),
-            max_waiting_requests: options.fetch(:max_waiting_requests, Gruf.rpc_server_options[:max_waiting_requests]),
-            poll_period: options.fetch(:poll_period, Gruf.rpc_server_options[:poll_period]),
-            pool_keep_alive: options.fetch(:pool_keep_alive, Gruf.rpc_server_options[:pool_keep_alive]),
-            connect_md_proc: options.fetch(:connect_md_proc, Gruf.rpc_server_options[:connect_md_proc]),
-            server_args: options.fetch(:server_args, Gruf.rpc_server_options[:server_args])
-          }
-
-          server = if @event_listener_proc
-                     server_options[:event_listener_proc] = @event_listener_proc
-                     Gruf::InstrumentableGrpcServer.new(**server_options)
-                   else
-                     GRPC::RpcServer.new(**server_options)
-                   end
-
-          @port = server.add_http2_port(@hostname, ssl_credentials)
-          @services.each { |s| server.handle(s) }
-          server
-        end
+      @server ||= begin
+        # For backward compatibility, we allow these options to be passed directly
+        # in the Gruf::Server options, or via Gruf.rpc_server_options.
+        server_options = {
+          pool_size: options.fetch(:pool_size, Gruf.rpc_server_options[:pool_size]),
+          max_waiting_requests: options.fetch(:max_waiting_requests, Gruf.rpc_server_options[:max_waiting_requests]),
+          poll_period: options.fetch(:poll_period, Gruf.rpc_server_options[:poll_period]),
+          pool_keep_alive: options.fetch(:pool_keep_alive, Gruf.rpc_server_options[:pool_keep_alive]),
+          connect_md_proc: options.fetch(:connect_md_proc, Gruf.rpc_server_options[:connect_md_proc]),
+          server_args: options.fetch(:server_args, Gruf.rpc_server_options[:server_args])
+        }
+
+        server = if @event_listener_proc
+                   server_options[:event_listener_proc] = @event_listener_proc
+                   Gruf::InstrumentableGrpcServer.new(**server_options)
+                 else
+                   GRPC::RpcServer.new(**server_options)
+                 end
+
+        @port = server.add_http2_port(@hostname, ssl_credentials)
+        @services.each { |s| server.handle(s) }
+        server
       end
     end
 
@@ -92,23 +88,11 @@ module Gruf
 
       server_thread = Thread.new do
         logger.info { "Starting gruf server at #{@hostname}..." }
-        server.run
-      end
-
-      stop_server_thread = Thread.new do
-        loop do
-          break if @stop_server
-
-          @stop_server_mu.synchronize { @stop_server_cv.wait(@stop_server_mu, 10) }
-        end
-        logger.info { 'Shutting down...' }
-        server.stop
+        server.run_till_terminated_or_interrupted(KILL_SIGNALS)
       end
-
       server.wait_till_running
       @started = true
       update_proc_title(:serving)
-      stop_server_thread.join
       server_thread.join
       @started = false
 
@@ -204,28 +188,10 @@ module Gruf
     #
     # :nocov:
     def setup
-      setup_signal_handlers
       load_controllers
     end
     # :nocov:
 
-    ##
-    # Register signal handlers
-    #
-    # :nocov:
-    def setup_signal_handlers
-      Signal.trap('INT') do
-        @stop_server = true
-        @stop_server_cv.broadcast
-      end
-
-      Signal.trap('TERM') do
-        @stop_server = true
-        @stop_server_cv.broadcast
-      end
-    end
-    # :nocov:
-
     ##
     # Auto-load all gRPC handlers
     #

data/lib/gruf/version.rb

@@ -16,5 +16,5 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Gruf
-  VERSION = '2.12.0'
+  VERSION = '2.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -241,9 +241,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.41.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -251,9 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.41.0
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -261,9 +255,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.41.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -271,9 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.41.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -394,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: gRPC Ruby Framework