grpc_kit 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6934bf16ccf69b6ba90fcbb6047a742a6f8650f983a6a63decc1a8d23663905b
-  data.tar.gz: 72afafb9a4ab33b2902e7cc224493317bd59590623a6c7de7db18adddf048505
+  metadata.gz: 6c232e2a6300f194de5b0a503a9c9311a481b3f391ed5dcda373d155b0fce817
+  data.tar.gz: 87b46a793349f6af462b7be02101e691e2c2e2cb252b871b1322a453457f17e9
 SHA512:
-  metadata.gz: 8cf73c55066c743b74cff8fa179a8cc3546fefdbe18e86b965a2cdb5bcf3db14c8dd75eeb8f9f771bb001cc1d099b3c4b04118e9bbccbffc69d1ebe49cb5bce2
-  data.tar.gz: 5dd4e03dd79f6b226a55a8255e957788823310e1e7697735d450e9fda50e9aaaa4b34f347eba6df6ad2fcdc8392d83168e152c59c061001adaf4fb9905000926
+  metadata.gz: 648fcb55a7244f237e10e677dd0a0f0a26f04e95e8d18494a8e53f137693d38e0820c069dc7cec6e400b29e40e81f7d8f1daab5d0fc02ffd337328e557c34dce
+  data.tar.gz: 53061fb0043f8a35cc8bc18c1da17547b23f6e865167a87c6f3e6fa00483c0af71a11880b29723d487f91de8687a1bb2207671e3af0d687582524743c62f1122

data/examples/routeguide_client.rb

@@ -1,23 +1,18 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/GlobalVars
-
 $LOAD_PATH.unshift File.expand_path('./examples/routeguide')
 
 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)
@@ -26,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),
@@ -44,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)
@@ -79,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
 
@@ -115,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 'grpc_kit'
 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
@@ -117,6 +115,7 @@ class Server < Routeguide::RouteGuide::Service
 end
 
 sock = TCPServer.new(50051)
+GrpcKit.logger = Logger.new('hoge', level: :debug)
 
 opts = {}
 

data/lib/grpc_kit/grpc/logger.rb

@@ -1,16 +1,11 @@
 # frozen_string_literal: true
 
-require 'logger'
-
 module GrpcKit
   module GRPC
     module DefaultLogger
-      # @return [Logger]
       def logger
-        LOGGER
+        GrpcKit.logger
       end
-
-      LOGGER = Logger.new(STDOUT)
     end
 
     unless methods.include?(:logger)

data/lib/grpc_kit/version.rb

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

metadata

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