thrift_rack 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbc7add06ec124797661d7ab6b729163133d05bd
-  data.tar.gz: 6119c9955c08cc5af4d639247b66176ce3e50d43
+SHA256:
+  metadata.gz: 91940d7237d325873fa1aa7b9a6db6d93549d76c60ce045695652664aa1ac375
+  data.tar.gz: 3853a703f5aa6b3aae575d18963c16c2b366c6da43faa186ea8dd2893037b2c0
 SHA512:
-  metadata.gz: fd58668bd96316d3a14d68a8327ba2ed69a5e96add76412c8f3bae539655d3287fb1fa409250951b4d3801062b165d54465b8144e7d0424eb71649d35d081517
-  data.tar.gz: 99bc7e9293e69f5531581b7f274f9c0a6538317837852f7bea34f255eae76d660253de2dc92023a334392e3216894b2410c6d8ead8747d123642b32f7e320880
+  metadata.gz: 7271e71e2410c02aa94ef4e81b0e5be8e0f310dda5338cde11f7d4458c8ee7cf84197a895b8e2fd7cf1905b1d849ee02d90951bfc17cd939908f617b07e77221
+  data.tar.gz: fa40c932b3bbb545eb7c93da1be7c43483e80f68450b4c07c1ff1520bfa3119aaf148348c398ab24ead02b2dade1f6b06e220c5c40e02036c7fe46c1e28fc2d5

data/Gemfile.lock

@@ -1,24 +1,26 @@
 PATH
   remote: .
   specs:
-    thrift_rack (0.2.3)
+    thrift_rack (0.2.5)
       net-http-persistent (>= 3.0)
-      rack (>= 2.0)
+      rack (>= 2.0.6)
+      redis (>= 3.0)
       thrift (~> 0.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
     method_source (0.9.0)
-    net-http-persistent (3.0.0)
+    net-http-persistent (3.0.1)
       connection_pool (~> 2.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.5)
+    rack (2.0.7)
     rake (10.5.0)
+    redis (4.1.2)
     thrift (0.10.0.0)
 
 PLATFORMS
@@ -31,4 +33,4 @@ DEPENDENCIES
   thrift_rack!
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/lib/thrift_rack/atom.rb

@@ -0,0 +1,30 @@
+require 'redis'
+class ThriftRack
+  class Atom
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      req = Rack::Request.new(env)
+      rpc_id = req.env["HTTP_X_RPC_ID"]
+      if rpc_id
+        if ThriftRack::Atom.redis.set("thrift_request:#{rpc_id}", true, nx: true, ex: 600)
+          @app.call(env)
+        else
+          [409, {}, ["RPC Request Processed"]]
+        end
+      else
+        @app.call(env)
+      end
+    end
+
+    class << self
+      attr_accessor :redis
+
+      def redis
+        @redis ||= Redis.new
+      end
+    end
+  end
+end

data/lib/thrift_rack/client.rb

@@ -9,56 +9,58 @@ class ThriftRack
       @client = client_klass.new(protocol)
     end
 
-    def logger
-      @logger ||= (defined? Rails) ? rails_logger : std_logger
-    end
-
     def protocol_factory
       Thrift::CompactProtocolFactory.new
     end
 
+    def respond_to_missing?(method, _include_private = false)
+      @client.respond_to?(method)
+    end
+
     def method_missing(method, *params)
       return super unless @client.respond_to?(method)
+
       self.class_eval do
         define_method method.to_sym do |*args|
           begin
             rpc_id = SecureRandom.uuid
             request_at = Time.now
-            @transport.add_headers({"X-Request-ID" => @request_id, "X-Rpc-ID" => rpc_id, "X-Rpc-Func" => method.to_s, "X-From" => ThriftRack::Client.app_name || "unknown"})
+            @transport.add_headers("X-Request-ID" => @request_id, "X-Rpc-ID" => rpc_id, "X-Rpc-Func" => method.to_s, "X-From" => ThriftRack::Client.app_name || "unknown")
             @client.send(method, *args)
           ensure
             end_time = Time.now
-            self.logger.info(JSON.dump({
-              request_at: request_at.iso8601(6),
-              request_id: @request_id,
-              rpc_id: rpc_id,
-              duration: ((end_time - request_at) * 1000).round(4),
-              path: URI(@url).path,
-              func: method,
-            }))
+            ThriftRack::Client.logger.info(
+              JSON.dump(
+                request_at: request_at.iso8601(6),
+                request_id: @request_id,
+                rpc_id: rpc_id,
+                duration: ((end_time - request_at) * 1000).round(4),
+                path: URI(@url).path,
+                func: method,
+              ),
+            )
           end
         end
       end
       self.public_send(method, *params)
     end
 
-    private
-
-    def rails_logger
-      file = File.open("#{Rails.root}/log/rpc_client.log", File::WRONLY | File::APPEND | File::CREAT)
-      file.sync = true
-      ActiveSupport::Logger.new(file)
-    end
-
-    def std_logger
-      ::Logger.new(STDOUT)
-    end
-
     class << self
-      attr_accessor :app_name, :pool_size
+      attr_accessor :app_name
+      attr_reader :pool_size
+
+      def logger
+        @logger ||= if defined? Rails
+                      ActiveSupport::Logger.new(File.open("#{Rails.root}/log/rpc_client.log", File::WRONLY | File::APPEND | File::CREAT))
+                    else
+                      ::Logger.new(STDOUT)
+                    end
+      end
 
       def pool_size=(p)
         http = Net::HTTP::Persistent.new(name: self.app_name, pool_size: p)
+        http.retry_change_requests = true
+        http.max_requests = 100
         http.verify_mode = 0
         HttpClientTransport.default = http
         @pool_size = p

data/lib/thrift_rack/http_client_transport.rb

@@ -4,6 +4,7 @@ require 'net/http/persistent'
 class ThriftRack
   class HttpClientTransport < Thrift::BaseTransport
     class RespCodeError < StandardError; end
+    class ProcessedRequest < StandardError; end
     def initialize(url, opts = {})
       @headers = {'Content-Type' => 'application/x-thrift'}
       @outbuf = Thrift::Bytes.empty_byte_buffer
@@ -26,7 +27,13 @@ class ThriftRack
       post.initialize_http_header(@headers)
       resp = retry_request_with_503{ThriftRack::HttpClientTransport.default.request(uri, post)}
       data = resp.body
-      raise RespCodeError.new("#{resp.code} on #{@url} with body #{data}") unless resp.code.to_i == 200
+      if resp.code.to_i != 200
+        if resp.code.to_i == 409
+          raise ProcessedRequest.new(@url)
+        else
+          raise RespCodeError.new("#{resp.code} on #{@url} with body #{data}")
+        end
+      end
       data = Thrift::Bytes.force_binary_encoding(data)
       @inbuf = StringIO.new data
     ensure
@@ -52,6 +59,8 @@ class ThriftRack
       def default
         return @default if @default
         @default = Net::HTTP::Persistent.new
+        @default.retry_change_requests = true
+        @default.max_requests = 100
         @default.verify_mode = 0
         @default
       end

data/lib/thrift_rack/launch_timestamp.rb

@@ -0,0 +1,12 @@
+class ThriftRack
+  class LaunchTimestamp
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      env['LAUNCH_AT'] = Time.now
+      @app.call(env)
+    end
+  end
+end

data/lib/thrift_rack/logger.rb

@@ -7,37 +7,40 @@ class ThriftRack
     end
 
     def call(env)
-      request_at = Time.now
+      request_at = env['LAUNCH_AT'] || Time.now
       req = Rack::Request.new(env)
       resp = @app.call(env)
       resp
     ensure
       end_time = Time.now
-      self.logger.info(JSON.dump({
-        request_at: request_at.iso8601(6),
-        request_id: req.env["HTTP_X_REQUEST_ID"],
-        rpc_id: req.env["HTTP_X_RPC_ID"],
-        duration: ((end_time - request_at) * 1000).round(4),
-        path: req.path,
-        func: req.env["HTTP_X_RPC_FUNC"],
-        from: req.env["HTTP_X_FROM"],
-      }))
+      ThriftRack::Logger.logger.info(
+        JSON.dump(
+          request_at: request_at.iso8601(6),
+          request_id: req.env["HTTP_X_REQUEST_ID"],
+          rpc_id: req.env["HTTP_X_RPC_ID"],
+          duration: ((end_time - request_at) * 1000).round(4),
+          path: req.path,
+          func: req.env["HTTP_X_RPC_FUNC"],
+          from: req.env["HTTP_X_FROM"],
+          tag: Logger.tag,
+        ),
+      )
     end
 
-    def logger
-      @logger ||= (defined? Rails) ? rails_logger : std_logger
-    end
-
-    private
+    class << self
+      attr_writer :tag
 
-    def rails_logger
-      file = File.open("#{Rails.root}/log/rpc.log", File::WRONLY | File::APPEND | File::CREAT)
-      file.sync = true
-      ActiveSupport::Logger.new(file)
-    end
+      def logger
+        @logger ||= if defined? Rails
+                      ActiveSupport::Logger.new(File.open("#{Rails.root}/log/rpc.log", File::WRONLY | File::APPEND | File::CREAT))
+                    else
+                      ::Logger.new(STDOUT)
+                    end
+      end
 
-    def std_logger
-      ::Logger.new(STDOUT)
+      def tag
+        @tag ||= {}
+      end
     end
   end
 end

data/lib/thrift_rack/sentry.rb

@@ -0,0 +1,13 @@
+class ThriftRack
+  class Sentry
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      req = Rack::Request.new(env)
+      Raven.extra_context(request_id: req.env["HTTP_X_REQUEST_ID"], rpc_id: req.env["HTTP_X_RPC_ID"], from: req.env["HTTP_X_FROM"])
+      @app.call(env)
+    end
+  end
+end

data/lib/thrift_rack/version.rb

@@ -1,3 +1,3 @@
 class ThriftRack
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/thrift_rack.rb

@@ -1,8 +1,11 @@
 require "thrift_rack/version"
 require "thrift_rack/server"
+require 'thrift_rack/sentry'
 require "thrift_rack/logger"
 require "thrift_rack/client"
+require 'thrift_rack/launch_timestamp'
 require 'thrift_rack/ping'
+require 'thrift_rack/atom'
 require 'thrift_rack/format_check'
 require 'thrift_rack/http_client_transport'
 
@@ -22,6 +25,7 @@ class ThriftRack
 
   def call(env)
     req = Rack::Request.new(env)
+    Thread.current["request"] = req
     server_class = @maps[req.path]
     return Rack::Response.new(["No Thrift Server For #{req.path}"], 404, {'Content-Type' => 'text/plain'}) unless server_class
 
@@ -32,13 +36,18 @@ class ThriftRack
     server_class.processor_class.new(server_class.new).process(protocol, protocol)
 
     resp
+  ensure
+    Thread.current["request"] = nil
   end
 
   def self.app(servers = nil)
     Rack::Builder.new(ThriftRack.new(servers)) do
+      use ThriftRack::LaunchTimestamp
       use ThriftRack::Ping
       use ThriftRack::FormatCheck
+      use ThriftRack::Atom
       use ThriftRack::Logger
+      use ThriftRack::Sentry if defined? Raven
     end
   end
 end

data/thrift_rack.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", ">= 2.0"
+  spec.add_dependency "rack", ">= 2.0.6"
   spec.add_dependency "thrift", '~> 0.10.0'
   spec.add_dependency 'net-http-persistent', ">= 3.0"
+  spec.add_dependency 'redis', '>=3.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift_rack
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - xuxiangyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,11 +125,14 @@ files:
 - config.ru
 - lib/config.ru
 - lib/thrift_rack.rb
+- lib/thrift_rack/atom.rb
 - lib/thrift_rack/client.rb
 - lib/thrift_rack/format_check.rb
 - lib/thrift_rack/http_client_transport.rb
+- lib/thrift_rack/launch_timestamp.rb
 - lib/thrift_rack/logger.rb
 - lib/thrift_rack/ping.rb
+- lib/thrift_rack/sentry.rb
 - lib/thrift_rack/server.rb
 - lib/thrift_rack/version.rb
 - thrift_rack.gemspec
@@ -139,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: thrift http rakc server