griffin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4d42dab0788aed394458a38fbcf88f9d5ebbe008ae97075c8df717d7022d4e
-  data.tar.gz: 1f5c7a121e48f18e2e3a16a9f2769b4f38ae7f4a4ce7649c3257263b306ba968
+  metadata.gz: 307fd7dcba526d6bb562bf97d4d7c31c0f82d1fdfb488de21a5fb1040cc6506e
+  data.tar.gz: 01a0b9ddfcd3486a9c1b378c11b22dc35856fd264f283c68e19f74973fe6f588
 SHA512:
-  metadata.gz: 34ab89ab90c27fb09ea40071c60c1bcd019fee2089034444bacf7531f38ae8ec61277fa9adf8440cd0a53eb11a9685ee026a2a44656c3b70d8602820e876df87
-  data.tar.gz: 19958ae78aa855bd8994636d3e4fdbd478af80868af31d14141dde8b71017095ef49584db8f8259bff2f32452b23355d65bf6e0a1f226e21f6d95ae0e1c3ba73
+  metadata.gz: 8780b448b45fb336c4bd7196e23e3901a64822fd0ed9661d8b2e59fb4d437feb2527cc1388b7162a2f927f37f229e36d6c5476bf2c5af17c407a38b298ab38b9
+  data.tar.gz: 6026c11481574d680a0b79295109da1405656aecd63424c3f228bbc765144d1019da666d3684d2efd8e1319c578df043607efff8d44e8a933f6a3b910a33f62f

data/examples/routeguide_client.rb

@@ -1,24 +1,18 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/GlobalVars
-
 $LOAD_PATH.unshift File.expand_path('./examples/routeguide')
 
 require 'griffin'
-require 'grpc_kit'
 require 'pry'
 require 'json'
-require 'logger'
 require 'routeguide_services_pb'
 
 RESOURCE_PATH = './examples/routeguide/routeguide.json'
 HOST = 'localhost'
 PORT = 50051
 
-$logger = Logger.new(STDOUT)
-
 def get_feature(stub)
-  $logger.info('===== get_feature =====')
+  GRPC.logger.info('===== get_feature =====')
   points = [
     Routeguide::Point.new(latitude:  409_146_138, longitude: -746_188_906),
     Routeguide::Point.new(latitude:  0, longitude: 0)
@@ -27,15 +21,15 @@ def get_feature(stub)
   points.each do |pt|
     feature = stub.get_feature(pt)
     if feature.name == ''
-      $logger.info("Found nothing at #{feature.inspect}")
+      GRPC.logger.info("Found nothing at #{feature.inspect}")
     else
-      $logger.info("Found '#{feature.name}' at #{feature.location.inspect}")
+      GRPC.logger.info("Found '#{feature.name}' at #{feature.location.inspect}")
     end
   end
 end
 
 def list_features(stub)
-  $logger.info('===== list_features =====')
+  GRPC.logger.info('===== list_features =====')
   rect = Routeguide::Rectangle.new(
     lo: Routeguide::Point.new(latitude: 400_000_000, longitude: -750_000_000),
     hi: Routeguide::Point.new(latitude: 420_000_000, longitude: -730_000_000),
@@ -45,12 +39,12 @@ def list_features(stub)
 
   loop do
     r = stream.recv
-    $logger.info("Found #{r.name} at #{r.location.inspect}")
+    GRPC.logger.info("Found #{r.name} at #{r.location.inspect}")
   end
 end
 
 def record_route(stub, size)
-  $logger.info('===== record_route =====')
+  GRPC.logger.info('===== record_route =====')
 
   features = File.open(RESOURCE_PATH) do |f|
     JSON.parse(f.read)
@@ -80,14 +74,14 @@ ROUTE_CHAT_NOTES = [
 ].freeze
 
 def route_chat(stub)
-  $logger.info('===== route_chat =====')
+  GRPC.logger.info('===== route_chat =====')
 
   call = stub.route_chat({})
 
   t = Thread.new do
     loop do
       rn = call.recv
-      $logger.info("Got message #{rn.message} at point point(#{rn.location.latitude}, #{rn.location.longitude})")
+      GRPC.logger.info("Got message #{rn.message} at point point(#{rn.location.latitude}, #{rn.location.longitude})")
     end
   end
 
@@ -116,5 +110,3 @@ get_feature(stub)
 list_features(stub)
 record_route(stub, 10)
 route_chat(stub)
-
-# rubocop:enable Style/GlobalVars

data/examples/routeguide_server.rb

@@ -6,13 +6,11 @@ require 'griffin'
 require 'pry'
 require 'json'
 require 'routeguide_services_pb'
-require 'logger'
 
 class Server < Routeguide::RouteGuide::Service
   RESOURCE_PATH = './examples/routeguide/routeguide.json'
 
   def initialize
-    @logger = Logger.new(STDOUT)
     File.open(RESOURCE_PATH) do |f|
       features = JSON.parse(f.read)
       @features = Hash[features.map { |x| [x['location'], x['name']] }]
@@ -23,12 +21,12 @@ class Server < Routeguide::RouteGuide::Service
 
   def get_feature(point, ctx)
     name = @features.fetch({ 'longitude' => point.longitude, 'latitude' => point.latitude }, '')
-    @logger.info("Point longitude=#{point.longitude}, latitude=#{point.latitude}, metadata=#{ctx.metadata}")
+    GRPC.logger.info("Point longitude=#{point.longitude}, latitude=#{point.latitude}, metadata=#{ctx.metadata}")
     Routeguide::Feature.new(location: point, name: name)
   end
 
   def list_features(rect, stream)
-    @logger.info('===== list_features =====')
+    GRPC.logger.info('===== list_features =====')
 
     @features.each do |location, name|
       if name.nil? || name == '' || !in_range(location, rect)
@@ -37,13 +35,13 @@ class Server < Routeguide::RouteGuide::Service
 
       pt = Routeguide::Point.new(location)
       resp = Routeguide::Feature.new(location: pt, name: name)
-      @logger.info(resp)
+      GRPC.logger.info(resp)
       stream.send_msg(resp)
     end
   end
 
   def record_route(stream)
-    @logger.info('===== record_route =====')
+    GRPC.logger.info('===== record_route =====')
     distance = 0
     count = 0
     features = 0
@@ -52,7 +50,7 @@ class Server < Routeguide::RouteGuide::Service
 
     loop do
       point = stream.recv # XXX: raise StopIteration
-      @logger.info(point)
+      GRPC.logger.info(point)
 
       count += 1
       name = @features.fetch({ 'longitude' => point.longitude, 'latitude' => point.latitude }, '')
@@ -75,7 +73,7 @@ class Server < Routeguide::RouteGuide::Service
   def route_chat(call)
     loop do
       rn = call.recv
-      @logger.info("route_note location=#{rn.location.inspect}, message=#{rn.message}")
+      GRPC.logger.info("route_note location=#{rn.location.inspect}, message=#{rn.message}")
       key = "#{rn.location.latitude} #{rn.location.longitude}"
       saved_msgs = @route_notes[key]
       @route_notes[key] << rn.message
@@ -116,17 +114,6 @@ class Server < Routeguide::RouteGuide::Service
   end
 end
 
-# require 'griffin/interceptors/server/payload_interceptor'
-require 'griffin/interceptors/server/filtered_payload_interceptor'
-require 'griffin/interceptors/server/logging_interceptor'
-require 'griffin/interceptors/server/x_request_id_interceptor'
-
-interceptors = [
-  Griffin::Interceptors::Server::FilteredPayloadInterceptor.new,
-  Griffin::Interceptors::Server::LoggingInterceptor.new,
-  Griffin::Interceptors::Server::XRequestIdInterceptor.new,
-]
-
 Griffin::Server.configure do |c|
   c.bind '127.0.0.1'
 
@@ -134,8 +121,6 @@ Griffin::Server.configure do |c|
 
   c.services Server.new
 
-  c.interceptors interceptors
-
   c.workers 2
 end
 

data/griffin.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib', 'pb']
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
 
   spec.add_dependency 'connection_pool', '~> 2.2.2'
-  spec.add_dependency 'grpc_kit', '~> 0.1.10'
+  spec.add_dependency 'grpc_kit', '~> 0.1.12'
   spec.add_dependency 'serverengine', '~> 2.0.7'
 end

data/lib/griffin/engine.rb

@@ -9,7 +9,7 @@ require 'griffin/engine/worker'
 module Griffin
   module Engine
     def self.start(config, cluster: false)
-      Griffin.logger = Griffin::Logger.create(config)
+      Griffin::Logger.setup(config)
 
       if cluster
         Griffin.logger.info("Griffin v#{Griffin::VERSION} starts as cluster mode")

data/lib/griffin/logger.rb

@@ -3,8 +3,22 @@
 module Griffin
   class Logger
     class << self
+      def setup(config)
+        config[:logger] = Griffin::Logger.create(config)
+        Griffin.logger = config[:logger]
+
+        m = Module.new do
+          def logger
+            Griffin.logger
+          end
+        end
+        # Not to set a logger to `Grpckit.logger` since `Grpckit.logger` prints many HTTP2 layer logs
+        # If you want to print them, add environment variable `GRPC_KIT_LOGLEVEL=debug`
+        GrpcKit::GRPC.extend(m)
+      end
+
       def create(config)
-        ServerEngine::DaemonLogger.new(logdev_from_config(config), config)
+        config[:logger] || ServerEngine::DaemonLogger.new(logdev_from_config(config), config)
       end
 
       def logdev_from_config(config)

data/lib/griffin/server.rb

@@ -14,9 +14,16 @@ module Griffin
     FORCIBLE_SHUTDOWN = '1'
 
     class << self
-      def run
+      # @param bind [String]
+      # @param port [Integer,String]
+      def run(bind: nil, port: nil)
         c = config_builder.build
-        Griffin::Engine.start(c, cluster: Integer(c[:workers]) > 1)
+        if c[:services].empty?
+          raise 'Required at least one service to handle reqeust'
+        end
+
+        opts = { bind: bind, port: port }.compact
+        Griffin::Engine.start(c.merge(opts), cluster: Integer(c[:workers]) > 1)
       end
 
       def configure
@@ -94,10 +101,8 @@ module Griffin
         end
       end
 
+      # Need Timeout?
       @thread_pool.shutdown
-      # unless @sever.session_count == 0
-      # end
-
       @command.close
       @signal.close
     end

data/lib/griffin/server_config_builder.rb

@@ -2,7 +2,7 @@
 
 module Griffin
   class ServerConfigBuilder
-    SERVERENGINE_PRIMITIVE_CONFIGS = %i[workers bind port log pid_path log_level].freeze
+    SERVERENGINE_PRIMITIVE_CONFIGS = %i[workers bind port log pid_path log_level logger].freeze
     SERVERENGINE_BLOCK_CONFIGS = %i[before_fork after_fork].freeze
     # Users can't change these values
     SERVERENGIEN_FIXED_CONFIGS = %i[daemonize worker_type worker_process_name].freeze
@@ -33,13 +33,14 @@ module Griffin
       port: 50051,
       pool_size: DEFAULT_POOL_SIZE,
       interceptors: [],
+      services: [],
     }.freeze
 
     def initialize
       @opts = DEFAULT_SERVER_CONFIG.dup
     end
 
-    (SERVERENGINE_PRIMITIVE_CONFIGS + GRIFFIN_CONFIGS + [:interceptors]).each do |name|
+    (SERVERENGINE_PRIMITIVE_CONFIGS + GRIFFIN_CONFIGS).each do |name|
       define_method(name) do |value|
         @opts[name] = value
       end
@@ -51,8 +52,12 @@ module Griffin
       end
     end
 
-    def services(serv, *rest)
-      @opts[:services] = Array(serv) + rest
+    def interceptors(*value)
+      @opts[:interceptors].concat(value).flatten!
+    end
+
+    def services(*value)
+      @opts[:services].concat(value).flatten!
     end
 
     def build

data/lib/griffin/thread_pool.rb

@@ -45,7 +45,10 @@ module Griffin
     def shutdown
       @shutdown = true
       @pool_size.times { @tasks.push(nil) }
-      sleep 1 until @workers.empty?
+      until @workers.empty?
+        Griffin.logger.debug("#{@pool_size - @spawned} worker thread(s) shutdowned, waiting #{@spawned}")
+        sleep 1
+      end
     end
 
     private

data/lib/griffin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ganmacs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement