thrift_rack 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8571e71f5bd664d42b6bb98cebd08bbd1226ebcc
-  data.tar.gz: 1f15614f521e256d8c3d2728eedcd115949e4c4a
+  metadata.gz: c273d19fb145e13d95492d12e9d2d132ad3034cc
+  data.tar.gz: 2ad194479ccb84197c6976e776779d398ac2bede
 SHA512:
-  metadata.gz: ba3f159d77c44e1bd3f31d5497dd5c86535fcdfa3d4b90843fa71c145026d4a4bbfb6e1540ab8e57995c97c962f36a16d6fc777db19682e71bf0cfe5a24f5539
-  data.tar.gz: a7bbcaa16095861818690e657259bcbb30d449b51783e37bb23773552505dba76777d201aa218bd714bb9d31d718a3236135ee9af8774a3a1364e16b4dc14d94
+  metadata.gz: dc091bdbeb0a9463ddb0a4c7cf32020d8eab74f495097207d230f22ad49b3277b717c311485f2340859ba0aa65d1ec854eb88f12e65a40cb05204f15cc559e8a
+  data.tar.gz: 0581140e263a3eb43ae57cc59dc2e3f8baecb0d2fc398ceebeb7bbfae96bbd396f9087101941da522ce32234d415809f4cdda4734fca36fb02afc7903d34a0f2

data/.gitignore

@@ -7,4 +7,4 @@
 /spec/reports/
 /tmp/
 /bin/
-thrift_rack-0.1.0.gem
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    thrift_rack (0.1.0)
+    thrift_rack (0.1.1)
       rack (>= 2.0)
       thrift (~> 0.10.0)
 

data/lib/thrift_rack.rb

@@ -1,9 +1,13 @@
 require "thrift_rack/version"
 require "thrift_rack/server"
+require "thrift_rack/logger"
+require "thrift_rack/client"
+require 'thrift_rack/ping'
+require 'thrift_rack/format_check'
+
 require 'rack'
 require 'thrift'
 
-
 class ThriftRack
   THRIFT_HEADER = "application/x-thrift"
 
@@ -17,10 +21,6 @@ class ThriftRack
 
   def call(env)
     req = Rack::Request.new(env)
-    return Rack::Response.new(["PONG"], 200, {'Content-Type' => 'text/plain'}) if req.path == "/ping"
-
-    return Rack::Response.new(["Not Valid Thrift Request"], 400, {'Content-Type' => 'text/plain'}) unless req.post? && req.env["CONTENT_TYPE"] == THRIFT_HEADER
-
     server_class = @maps[req.path]
     return Rack::Response.new(["No Thrift Server For #{req.path}"], 404, {'Content-Type' => 'text/plain'}) unless server_class
 
@@ -35,9 +35,9 @@ class ThriftRack
 
   def self.app(servers = nil)
     Rack::Builder.new(ThriftRack.new(servers)) do
-      use Rack::CommonLogger
-      use Rack::ShowExceptions
-      use Rack::Lint
+      use ThriftRack::Ping
+      use ThriftRack::FormatCheck
+      use ThriftRack::Logger
     end
   end
 end

data/lib/thrift_rack/client.rb

@@ -0,0 +1,60 @@
+require 'thrift'
+require 'securerandom'
+class ThriftRack
+  class Client
+    def initialize(url, client_klass, request_id)
+      @rpc_id = SecureRandom.uuid
+      @request_id = request_id
+      @url = url
+      @transport = Thrift::HTTPClientTransport.new(url, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE)
+      @transport.add_headers({"X-Request-ID" => @request_id, "X-Rpc-ID" => @rpc_id})
+      protocol = protocol_factory.get_protocol(@transport)
+      @client = client_klass.new(protocol)
+
+    end
+
+    def logger
+      @logger ||= (defined? Rails) ? rails_logger : std_logger
+    end
+
+    def protocol_factory
+      Thrift::CompactProtocolFactory.new
+    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
+            request_at = Time.now
+            @transport.add_headers({"X-Rpc-Func" => method.to_s})
+            @client.send(method, *args)
+          ensure
+            end_time = Time.now
+            self.logger.info(JSON.dump({
+              request_at: request_at.iso8601,
+              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
+  end
+end

data/lib/thrift_rack/format_check.rb

@@ -0,0 +1,13 @@
+class ThriftRack
+  class FormatCheck
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      req = Rack::Request.new(env)
+      return Rack::Response.new(["Not Valid Thrift Request"], 400, {'Content-Type' => 'text/plain'}) unless req.post? && req.env["CONTENT_TYPE"] == THRIFT_HEADER
+      @app.call(env)
+    end
+  end
+end

data/lib/thrift_rack/logger.rb

@@ -0,0 +1,42 @@
+require 'logger'
+require 'json'
+class ThriftRack
+  class Logger
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      request_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,
+        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"],
+      }))
+    end
+
+    def logger
+      @logger ||= (defined? Rails) ? rails_logger : std_logger
+    end
+
+    private
+
+    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 std_logger
+      ::Logger.new(STDOUT)
+    end
+  end
+end

data/lib/thrift_rack/ping.rb

@@ -0,0 +1,13 @@
+class ThriftRack
+  class Ping
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      req = Rack::Request.new(env)
+      return Rack::Response.new(["PONG"], 200, {'Content-Type' => 'text/plain'}) if req.path == "/ping"
+      @app.call(env)
+    end
+  end
+end

data/lib/thrift_rack/version.rb

@@ -1,3 +1,3 @@
 class ThriftRack
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift_rack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - xuxiangyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -96,6 +96,10 @@ files:
 - Rakefile
 - config.ru
 - lib/thrift_rack.rb
+- lib/thrift_rack/client.rb
+- lib/thrift_rack/format_check.rb
+- lib/thrift_rack/logger.rb
+- lib/thrift_rack/ping.rb
 - lib/thrift_rack/server.rb
 - lib/thrift_rack/version.rb
 - thrift_rack.gemspec