griffin 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7b2f3dcac9c02956616faade9a47f0df671b7f0f2dd8e2c06e3bfcd7de8ff2
-  data.tar.gz: 5ed1d0fb576d07f41ec432fa291ba366252d3194d3ebb9a4218ee2f399f4ad3d
+  metadata.gz: 88012127751815ee208777e0b26726b32941c06f312d4cadc0ccbf4f58a4c645
+  data.tar.gz: 312eb9afccef8d2edc0f42d57fca716bcccaf3166c6f72dfb37ebc632d212ed7
 SHA512:
-  metadata.gz: 0fde56dc4c8f8e650162554cdbbf1006e45ee9918679db86a768e46db387aac3af5ba2ea2709d77c168eff34dd87dee272bd86cdc8680542b9698d58033e60b2
-  data.tar.gz: d26aa6c934581fc68037b8419c21e2f00032f4ad79a46a226b010ebf2e236d33cbe7b28ffafe8fb4f04588a017066923869eb8f6e8a9a034714a1dbd2df007e8
+  metadata.gz: 48d451452794366756fb8f9ea13f2ce5c1f08c07ee8b11b2477ff4934b11cf7c2a84b98859594836e0f348bfbefc8bc9d1437fd9c73bd0f4539d0a6c844f50af
+  data.tar.gz: 14b127ce13955d3a354856693299ee93e1d390988f73d96c1b8b2a00cd2a29c4578f8c003392ded533fc6450c43d914533eec85e94bd12cdeaee3a7618dc060d

data/griffin.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'grpc_kit', '>= 0.3.4'
+  spec.add_dependency 'grpc_kit', '>= 0.3.6'
   spec.add_dependency 'serverengine', '~> 2.0.7'
 end

data/lib/griffin/engine/worker.rb

@@ -19,12 +19,36 @@ module Griffin
         @lsock.close if @lsock
       end
 
-      def stop
-        server.core.shutdown
+      def stop(signal = nil)
+        kind = case signal
+               when ServerEngine::Signals::GRACEFUL_STOP then Griffin::Server::GRACEFUL_SHUTDOWN
+               when ServerEngine::Signals::IMMEDIATE_STOP then Griffin::Server::FORCE_SHUTDOWN
+               when ServerEngine::Signals::GRACEFUL_RESTART then Griffin::Server::GRACEFUL_RESTART
+               else Griffin::Server::GRACEFUL_SHUTDOWN
+               end
+        server.core.shutdown(kind)
       end
 
-      # def after_fork; end
-      # def reload; end
+      # Overwrite to identify the kind of signal in #stop
+      # https://github.com/treasure-data/serverengine/blob/a005f3535affaa5b15d1e66486d9349443398dd2/lib/serverengine/worker.rb#L61-L78
+      def install_signal_handlers
+        w = self
+        ServerEngine::SignalThread.new do |st|
+          st.trap(ServerEngine::Signals::GRACEFUL_STOP) { |s| w.stop(s) }
+          st.trap(ServerEngine::Signals::IMMEDIATE_STOP, 'SIG_DFL')
+
+          st.trap(ServerEngine::Signals::GRACEFUL_RESTART) { |s| w.stop(s) }
+          st.trap(ServerEngine::Signals::IMMEDIATE_RESTART, 'SIG_DFL')
+
+          st.trap(ServerEngine::Signals::RELOAD) {
+            w.logger.reopen!
+            w.reload
+          }
+          st.trap(ServerEngine::Signals::DETACH) { |s| w.stop(s) }
+
+          st.trap(ServerEngine::Signals::DUMP) { w.dump }
+        end
+      end
     end
   end
 end

data/lib/griffin/server.rb

@@ -12,6 +12,7 @@ module Griffin
 
     GRACEFUL_SHUTDOWN = '0'
     FORCIBLE_SHUTDOWN = '1'
+    GRACEFUL_RESTART = '2'
 
     class << self
       # @param bind [String]
@@ -131,6 +132,13 @@ module Griffin
         @status = :stop
         @server.graceful_shutdown
         true
+      when GRACEFUL_RESTART
+        Griffin.logger.info("Restart sever(id=#{@worker_id}) gracefully...")
+
+        @status = :restart
+        # timeout is false since we don't know when all connections are closed by clients.
+        @server.graceful_shutdown(timeout: false)
+        true
       end
     end
   end

data/lib/griffin/server_config_builder.rb

@@ -67,6 +67,7 @@ module Griffin
       @opts[:min_connection_size] = Integer(min)
       @opts[:max_connection_size] = Integer(max)
     end
+
     def interceptors(*value)
       @opts[:interceptors].concat(value).flatten!
     end

data/lib/griffin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Griffin
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement