rails_grpc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d366cc22163cbb02c16dc299be7180222183b608
-  data.tar.gz: 8ec96617b1c0b8d9acf4120545a0863e6e3111fc
+  metadata.gz: 77799fe1c9e201856a2f7caf30278367261f84a1
+  data.tar.gz: dcf08de3fa9abe88417e3e5277809761bf0d9e5a
 SHA512:
-  metadata.gz: 57c873d6cbbf088ba58263b0e29334598edbfe635a6872ff7ea921e8bb73476c3c69b2e70789a53958826f4a996e2a6a7bb69f2f5e756b36cfdd0fcf4cca5b3b
-  data.tar.gz: a44d0ce699339c40333385a9a46c12968c8543b5cbfa31eb821a67cf2ac3a6d75df73de08c52d46183a346803614209a930e901151dbc80333ae29e7cc66e908
+  metadata.gz: df1e394da19657184461b21c7a8a4895472fb3633ca977192a2e4f877eb81642eab033e3325256a809b09e1aaca4a8546e14b83764ef33303d729055843fb65c
+  data.tar.gz: b091153b324be138a6a875014bbe44fdb3c7ad2c98a821a9acbf0955373e01841cde38d20973fa89ecd3a1024a5886c16ced07f00b66c0e5834774aae4c8b2dc

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    rails_grpc (0.1.1)
+    rails_grpc (0.1.2)
       grpc
       protobuf
       rails

data/exe/grpc

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/rails_grpc/cli"
+
+begin
+  cli = RailsGrpc::CLI.instance
+  cli.parse
+  cli.run
+rescue => e
+  STDERR.puts e.message
+  STDERR.puts e.backtrace.join("\n")
+  exit 1
+end

data/lib/rails_grpc/boot.rb

@@ -0,0 +1,39 @@
+module RailsGrpc
+  class Boot
+    attr_accessor :server
+
+    GRPC_DEFAULT_PORT = "127.0.0.1:5050"
+    GRPC_DEFAULT_POOL_SIZE = 1
+    RAILS_BOOT_PATH  = "config/environment.rb"
+    GRPC_CONFIG_PATH = "config/grpc.yml"
+
+    def exec(environment)
+      require File.expand_path(RAILS_BOOT_PATH) # Load rails
+      require "rails_grpc/general_server"
+
+      c = config[environment]
+      @server = RailsGrpc::GeneralServer.new(
+        port: c["server"]["port"] || GRPC_DEFAULT_PORT,
+        pool_size: c["server"]["pool_size"] || GRPC_DEFAULT_POOL_SIZE
+      )
+      @server.set_handlers(c["handlers"].map(&:constantize))
+      @server.run
+    end
+
+    private
+
+    def config
+      @_config ||= load_config_file
+    end
+
+    def load_config_file
+      if File.exist?(GRPC_CONFIG_PATH)
+        require 'erb'
+        YAML.load(ERB.new(IO.read(GRPC_CONFIG_PATH)).result)
+      else
+        puts "config/grpc.yml file not found."
+        exit 1
+      end
+    end
+  end
+end

data/lib/rails_grpc/cli.rb

@@ -0,0 +1,117 @@
+require "singleton"
+require "rails_grpc/boot"
+
+module RailsGrpc
+  class CLI
+    include Singleton
+
+    WORKER_LAUNCH_RETRY_LIMIT = 3
+    RAILS_LAUNCH_WAIT_TIME = 10 # FIXME
+
+    attr_accessor :worker_pid, :server, :mutex
+
+    def initialize
+      @mutex = Mutex.new
+      set_environment
+    end
+
+    def parse
+    end
+
+    def run
+      @worker_pid = Process.fork
+      if @worker_pid
+        print_banner
+        puts "Start GRPC master (pid: #{$$})"
+        set_master_trap
+        Process.waitall
+      else
+        boot_grpc_server
+      end
+    end
+
+    private
+
+    def set_environment
+      env ||= ENV["RAILS_ENV"]
+      env ||= ENV["RACK_ENV"]
+      env ||= "development"
+
+      ENV["RAILS_ENV"] = ENV["RACK_ENV"] = env
+      env
+    end
+
+    def environment
+      ENV["RAILS_ENV"]
+    end
+
+    def boot_grpc_server
+      RailsGrpc::Boot.new.exec(environment)
+    end
+
+    def print_banner
+      puts "\e[#{31}m"
+      puts <<-EOS
+          ÛÛÛÛÛÛÛÛÛÛÛ   ÛÛÛÛÛÛÛÛÛÛÛ    ÛÛÛÛÛÛÛÛÛ
+         °°ÛÛÛ°°°°°ÛÛÛ °°ÛÛÛ°°°°°ÛÛÛ  ÛÛÛ°°°°°ÛÛÛ
+  ÛÛÛÛÛÛÛ °ÛÛÛ    °ÛÛÛ  °ÛÛÛ    °ÛÛÛ ÛÛÛ     °°°
+ ÛÛÛ°°ÛÛÛ °ÛÛÛÛÛÛÛÛÛÛ   °ÛÛÛÛÛÛÛÛÛÛ °ÛÛÛ
+°ÛÛÛ °ÛÛÛ °ÛÛÛ°°°°°ÛÛÛ  °ÛÛÛ°°°°°°  °ÛÛÛ
+°ÛÛÛ °ÛÛÛ °ÛÛÛ    °ÛÛÛ  °ÛÛÛ        °°ÛÛÛ     ÛÛÛ
+°°ÛÛÛÛÛÛÛ ÛÛÛÛÛ   ÛÛÛÛÛ ÛÛÛÛÛ        °°ÛÛÛÛÛÛÛÛÛ
+ °°°°°ÛÛÛ°°°°°   °°°°° °°°°°          °°°°°°°°°
+ ÛÛÛ °ÛÛÛ
+°°ÛÛÛÛÛÛ
+ °°°°°°
+EOS
+      puts "\e[0m"
+    end
+
+    def set_master_trap
+      Signal.trap(:USR1) do
+        t = Thread.new do
+          @mutex.synchronize do
+            launch_new_worker
+          end
+        end
+        t.report_on_exception = false
+        t.run
+      end
+    end
+
+    def launch_new_worker
+      new_worker_pid = Process.fork
+      if new_worker_pid
+        puts "Launch new worker process (pid: #{new_worker_pid}) and kill old worker (pid:#{@worker_pid})"
+        retry_limit = WORKER_LAUNCH_RETRY_LIMIT
+
+        # FIXME: ugly code
+        while !process_exists?(new_worker_pid)
+          puts "waiting new worker"
+          sleep 1
+
+          retry_limit -= 1
+          if retry_limit < 0
+            puts "Failed to Launch new worker..."
+            exit 1
+          end
+        end
+        sleep RAILS_LAUNCH_WAIT_TIME # FIXME: bad code
+
+        Process.kill("TERM", @worker_pid)
+        @worker_pid = new_worker_pid
+      else
+        boot_grpc_server
+      end
+    end
+
+    def process_exists?(pid)
+      Process.kill(0, pid.to_i)
+      true
+    rescue Error::SCRCH # no such process
+      false
+    rescue Error::EPERM # process exists, no permission
+      true
+    end
+  end
+end

data/lib/rails_grpc/dependencies.rb

@@ -19,9 +19,10 @@ module RailsGrpc
       end
 
       def find_proto_message_definitions
-        find_proto_lib_files.reject do |t|
+        messages = find_proto_lib_files.reject do |t|
           File.basename(t).include?("_services_pb.rb")
         end
+        messages.sort_by { |m| m.include?("_model_pb.rb") ? 0 : 1 } # FIXME: temporary patch to load model first
       end
 
       def find_proto_service_definitions

data/lib/rails_grpc/interceptor/logging_interceptor.rb

@@ -10,14 +10,20 @@ module RailsGrpc
       def request_response(request: nil, call: nil, method: nil)
         grpc_method = "#{method.owner.name}##{method.name}"
         logger = @logger
-        logger.debug("[GRPC] #{grpc_method}")
+        logger.info("[GRPC] #{grpc_method}")
         t = Time.now
 
-        yield
+        begin
+          yield
+        rescue => e
+          logger.error(e)
+          logger.error(e.backtrace.join("\n"))
+          raise e
+        end
 
         t = Time.now - t
         display_duration = "%.1f ms" % (t * 1000.0)
-        logger.debug("[GRPC response] (#{display_duration}) #{grpc_method}")
+        logger.info("[GRPC response] (#{display_duration}) #{grpc_method}")
       end
     end
   end

data/lib/rails_grpc/logger.rb

@@ -10,6 +10,7 @@ module RailsGrpc
 
         if Rails.env.development? || Rails.env.test?
           std_logger = ActiveSupport::Logger.new(STDOUT)
+          std_logger.formatter = ActiveSupport::Logger::Formatter.new
           multiple_loggers = ActiveSupport::Logger.broadcast(std_logger)
           original_logger.extend(multiple_loggers)
         end

data/lib/rails_grpc/version.rb

@@ -1,3 +1,3 @@
 module RailsGrpc
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_grpc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,8 @@ dependencies:
 description: gRPC for Ruby on Rails
 email:
 - nishio@densan-labs.net
-executables: []
+executables:
+- grpc
 extensions: []
 extra_rdoc_files: []
 files:
@@ -112,7 +113,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/grpc
 - lib/rails_grpc.rb
+- lib/rails_grpc/boot.rb
+- lib/rails_grpc/cli.rb
 - lib/rails_grpc/dependencies.rb
 - lib/rails_grpc/extension/rpc_server.rb
 - lib/rails_grpc/general_server.rb