grpc_kit 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd6355c75605e749f1590fa3f3f3346f5d77288753df21cd104c9af78d22f5f
-  data.tar.gz: 3e6d0c8606b0476edaca281b510b1c8d1f047df7accc479e2b1e569567869497
+  metadata.gz: cb45ef9b949590a6d6f7892fc3ee999e18e986e702cf0404c2a8de8138c8b12e
+  data.tar.gz: 67efa185e194d7da4efd9fd8e1638d6ecd381b27e8572452fc337902d6969d3d
 SHA512:
-  metadata.gz: bde53f9753f23d273ed4b211c63f2e4727e88c8d67b9b330add41c9bec5b82ebbe884c551c496c5fcdca57252e36d58660ac5a70f31ecd8cb84f00258a6972f9
-  data.tar.gz: 75d4b9b74c7cc99111c348c754c79cda00295745485ee6d28a4e0aa492bc28bcc6303dd04bbd95320a483a3bc8559840c79be09621eabb04bfb853b7e7be9760
+  metadata.gz: 28418bf3d585a8b711ee7589ea2a591a834ec061802d97aa846242fd9ced64ed8ffda4179a1c25cf90ee2fbeaa1bba538c57932500da6ecb19eba7ab8b203e8f
+  data.tar.gz: 99be80c042bbf6b19d8c6385b8b778abfea9a2a007f22eeb1febbccc88a35d6646ba2df3fd5e915f7f9353a67b5581cc083540afc2484f46a717ef7d0c78ceea

data/lib/grpc_kit.rb

@@ -7,11 +7,16 @@ require 'grpc_kit/server'
 require 'grpc_kit/client'
 
 module GrpcKit
-  def self.logger
-    @logger ||= Logger.new(STDOUT, level: :debug)
-  end
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger ||= Logger.new(STDOUT, level: ENV['GRPC_KIT_LOGLEVEL'] || :info)
+    end
 
-  def self.logger=(logger)
-    @logger = logger
+    # @params level [String] :debug, :info, :warn, :error, :fatal or :unknown
+    def self.loglevel=(level)
+      logger.level = level
+    end
   end
 end

data/lib/grpc_kit/server.rb

@@ -36,14 +36,6 @@ module GrpcKit
       end
     end
 
-    def wait_shutdown
-      loop do
-        return if @stopping
-
-        sleep 1
-      end
-    end
-
     def force_shutdown
       # expected to be called in trap context
       Thread.new do
@@ -60,10 +52,12 @@ module GrpcKit
       Thread.new do
         GrpcKit.logger.debug('graceful shutdown')
         @mutex.synchronize { @sessions.each(&:drain) }
+        @stopping = true
+
         begin
           Timeout.timeout(@max_graceful_wait) do
             loop do
-              break if @mutex.synchronize { @sessions.empty? }
+              break if @sessions.empty?
 
               sleep 1
             end
@@ -71,11 +65,13 @@ module GrpcKit
         rescue Timeout::Error => _
           GrpcKit.logger.debug('Max wait time expired')
         end
-
-        @stopping = true
       end
     end
 
+    def session_count
+      @mutex.synchronize { @sessions.size }
+    end
+
     # @params path [String]
     # @params stream [GrpcKit::Streams::ServerStream]
     def dispatch(path, stream)

data/lib/grpc_kit/session/client_session.rb

@@ -24,7 +24,6 @@ module GrpcKit
         @opts = opts
         @draining = false
         @stop = false
-        @last_stream_id = 0
       end
 
       def send_request(data, headers)
@@ -84,11 +83,9 @@ module GrpcKit
         shutdown
         raise e
       rescue DS9::Exception => e
-        shutdown
+        GrpcKit.logger.debug(e.message)
         if DS9::ERR_EOF == e.code
-          @peer_shutdowned = true
-          return
-          # raise EOFError
+          raise EOFError, e
         end
 
         raise e
@@ -185,7 +182,6 @@ module GrpcKit
           @streams.each_value(&:drain)
         end
 
-        @last_stream_id = last_stream_id
         @streams.each do |id, stream|
           if id > last_stream_id
             stream.close

data/lib/grpc_kit/session/server_session.rb

@@ -31,27 +31,22 @@ module GrpcKit
       def start
         @io.wait_readable
         loop do
-          break if @stop
-
           invoke
 
-          if !want_read? && !want_write?
-            break
-          elsif @peer_shutdowned && !want_write?
-            break
-          end
-
-          run_once
+          continue = run_once
+          break unless continue
         end
-      rescue Errno::ECONNRESET, IOError => e
-        GrpcKit.logger.debug(e.message)
-        shutdown
       ensure
         GrpcKit.logger.debug('Finish server session')
       end
 
+      # @return [bool] return session can continue
       def run_once
-        return if @stop
+        if @peer_shutdowned || @stop || !(want_read? || want_write?)
+          # it could be called twice
+          @streams.each_value(&:close)
+          return false
+        end
 
         if @drain
           if @streams.empty?
@@ -69,6 +64,12 @@ module GrpcKit
         if want_write?
           send
         end
+
+        true
+      rescue Errno::ECONNRESET, IOError => e
+        GrpcKit.logger.debug(e.message)
+        shutdown
+        false
       end
 
       def drain
@@ -98,9 +99,6 @@ module GrpcKit
 
       def do_read
         receive
-      rescue IOError => e
-        shutdown
-        raise e
       rescue DS9::Exception => e
         shutdown
         if DS9::ERR_EOF == e.code
@@ -153,9 +151,8 @@ module GrpcKit
           if frame.ping_ack?
             GrpcKit.logger.debug('ping ack is received')
             # nghttp2 can't send any data once server sent actaul GoAway(not shutdown notice) frame.
-            # We want to send data in this case when ClientStreamer or BidiBstreamer which they are sending data in same stream
+            # We want to send data in case of ClientStreamer or BidiBstreamer which they are sending data in same stream
             # So we have to wait to send actual GoAway frame untill timeout or something
-
             # @drain.recv_ping_ack if @drain
           end
           # when DS9::Frames::Goaway

data/lib/grpc_kit/transport/send_buffer.rb

@@ -5,7 +5,6 @@ module GrpcKit
     class SendBuffer
       def initialize
         @buffer = nil
-        @pos = 0
         @end_write = false
       end
 
@@ -17,8 +16,6 @@ module GrpcKit
         else
           @buffer = data
         end
-
-        data.size
       end
 
       def end_write

data/lib/grpc_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9