gruf 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53a6a934e512aeba4261172db33d22e9994ede7f
-  data.tar.gz: 5fb09d8483bd0ff4d22f759ab9ae442b3f4e63cb
+SHA256:
+  metadata.gz: 5e2128aead5d95df32a7c576007e1f725321d994a30dcc799369ef04a2866bae
+  data.tar.gz: 9cce18e801ce59b8d156f9f02fdb0266281bea439cd6da85e94d7a0c6ca45df1
 SHA512:
-  metadata.gz: 6f8ff602e9d5a53eface3706b55546dd83f964cae57a20d1dc41d74aa6770a6f06d67a3a1aa0c040f3091b03cc3a132bca6d83ed3eb5351ee0520b7c480d6c0f
-  data.tar.gz: a44dd99112b76fa2f5116a6418cc80a90c5c7ff8a1ad8a4c45e03bcd384172ced2221d60daf7614c2a022f107b2fdd19e0d786c84dfb4ea9c3a4b1f090f3fbc5
+  metadata.gz: 47e56d29f46dbdd51634bff6c2cba63b482e99ab94a57022e231bd4d081f8b26efcefa524712dd3a9faf0edc9aeddc07895b01a1acf51b9f24f512657faba61d
+  data.tar.gz: e3b9a9e56016f3ede0520bfc4fafd1f9409c32ea16a977ca27f6c296d0215d26ec9f1d8de705659710da855f22de6083c0681cdc5b974ef80b2602144892f488

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.2.0
+
+- Run server in a monitored thread to allow for trapped exits on sigints
+
 ### 2.1.1
 
 - Add ability to pass in client stub options into Gruf::Client 

data/README.md

@@ -17,9 +17,9 @@ up fast and efficiently at scale. Some of its features include:
   still preserving gRPC BadStatus codes
 * Server and client execution timings in responses
 
-gruf currently has active support for gRPC 1.4.x-1.8.x. gruf is compatible and tested with Ruby 2.2,
-2.3, and 2.4. gruf is also not [Rails](https://github.com/rails/rails)-specific, and can be used in any
-Ruby framework (such as [Grape](https://github.com/ruby-grape/grape), for instance).
+gruf currently has active support for gRPC 1.4.x-1.9.x. gruf is compatible and tested with Ruby 2.2-2.5. 
+gruf is also not [Rails](https://github.com/rails/rails)-specific, and can be used in any Ruby framework 
+(such as [Grape](https://github.com/ruby-grape/grape), for instance).
 
 ## Installation
 

data/lib/gruf/server.rb

@@ -39,7 +39,10 @@ module Gruf
       @interceptors = Gruf::Interceptors::Registry.new unless @interceptors.is_a?(Gruf::Interceptors::Registry)
       @services = []
       @started = false
-      setup!
+      @stop_server = false
+      @stop_server_cv = ConditionVariable.new
+      @stop_server_mu = Monitor.new
+      setup
     end
 
     ##
@@ -58,18 +61,25 @@ module Gruf
     # Start the gRPC server
     #
     # :nocov:
-    # rubocop:disable Lint/ShadowedException
     def start!
+      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
+      end
+
       logger.info { 'Booting gRPC Server...' }
       @started = true
-      server.run_till_terminated
-    rescue Interrupt, SignalException, SystemExit
-      logger.info { 'Shutting down gRPC server...' }
+      server.run
+      stop_server_thread.join
       @started = false
-      server.stop
+
+      logger.info { 'Goodbye!' }
     end
     # :nocov:
-    # rubocop:enable Lint/ShadowedException
 
     ##
     # @param [Class] klass
@@ -139,11 +149,40 @@ module Gruf
 
     private
 
+    ##
+    # Setup server
+    #
+    # :nocov:
+    def setup
+      setup_signal_handlers
+      load_controllers
+    end
+    # :nocov:
+
+    ##
+    # Register signal handlers
+    #
+    # :nocov:
+    def setup_signal_handlers
+      Thread.abort_on_exception = true
+
+      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
     #
     # :nocov:
-    def setup!
+    def load_controllers
       return unless File.directory?(controllers_path)
       path = File.realpath(controllers_path)
       $LOAD_PATH.unshift(path)

data/lib/gruf/version.rb

@@ -14,5 +14,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.1.1'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: gRPC Ruby Framework