rack_xrk_log 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c477b13da897a24979b7fa4ff8efee664dbab4
-  data.tar.gz: 6d5693a9313144351f54d599d3dd1a7750e61e4d
+  metadata.gz: 63716c6fd344c619bcf67fc46017061364db4684
+  data.tar.gz: cfd93192918c6fa220b6464bb4090e62f16e0087
 SHA512:
-  metadata.gz: c81a2b731648f5c931aa0e960bcd0ad53749ecd372b8c0ba49ebe133a68ba5830b819b3155e882078ea6b5796a9827b548f449af1f0f824210e76495a8a28e72
-  data.tar.gz: bc0940bd2e1eb07ac3bde446f46648350457ba409f1528eb5bc1de8cfe7351d92b776dd179dc8201c01f716579e2b499dea3ced5d8954b3125c7168322cbd07a
+  metadata.gz: 129b1b5d9cfe4e05b5b92e138e5b1deccfe66175a0b88f0f0e3610b36c492c36f1047e21b7190ec8976a02eb4eb97a5db66687b0b917cae4b94779cd51908173
+  data.tar.gz: 36e8479e0bc6157b470539b4fd965e7ca4e682db14da4f3254cf6f84dfe205e824ee5445ae50168172a2582440e3a3d5b04d7e1812398026fe9c36b1ea4fa57b

data/README.md

@@ -7,12 +7,12 @@ rack log for logstash
 1. 增加 Gem
 
 ~~~
-gem 'rack_xrk_log',  :git => 'git@github.com:louis813/rack_xrk_log.git'
+gem 'rack_xrk_log'
 ~~~
 
 2. 在 config.ru 增加
 
 ~~~
 require 'rack/xrk/log'
-use Rack::Xrk::Log::CommonLogger, Rails.logger
+use Rack::XrkLog::CommonLogger
 ~~~

data/lib/rack/xrk/log/commonlogger.rb

@@ -1,45 +1,22 @@
-require 'rack/commonlogger'
 require 'json'
+require ::File.expand_path("../../adapter/dispose", __FILE__)
 
 module Rack
-  module Xrk
-    module Log
-      class CommonLogger < Rack::CommonLogger
+  module XrkLog
+    class CommonLogger
 
-        def initialize(app, logger=nil)
-          logger = ::Logger.new(::File.new("log/#{app.class.parent_name.downcase}_quality_access.log","a+"))
-          logger.formatter = proc do |severity, datetime, progname, msg|
-             "#{msg}\n"
-          end
-          super(app, logger)
-        end
-
-        def log(env, status, header, began_at)
-          logger = @logger || env['rack.errors']
-
-          return unless header["Content-Type"].present? && (header["Content-Type"].include? "text/html")
-
-          application_name      = @app.class.parent_name
-          log_type              = "ACESS"
-          client_ip_and_port    = (env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR'] || '-')
-          response_data_length  = env['action_controller.instance'].response_body.to_s.bytesize
-          query_string          = (env['QUERY_STRING'].empty? ? "" : "?"+env['QUERY_STRING'])
-          controller            = env['action_dispatch.request.path_parameters'][:controller]
-          action                = env['action_dispatch.request.path_parameters'][:action]
-          return_content        = env['action_controller.instance'].response_body
-          return_content        = (return_content.empty? ? "" : return_content.to_s[0..99])
-
-          data = "#{began_at.to_i}, #{application_name}, #{log_type}, #{client_ip_and_port}, #{env['HTTP_HOST']}, #{(Time.now - began_at).to_i}, #{env['rack.url_scheme']}, #{env['CONTENT_LENGTH']}, #{response_data_length},".gsub("\n", "")
-
-          dynamic_params = "#{env['REQUEST_METHOD']} #{env['REQUEST_PATH']}, #{status.to_s[0..3]}, #{query_string}, #{controller} #{action}, , #{return_content}".gsub("\n", "")
-
-          data.concat(dynamic_params)
-
-          logger.info(data) if logger
+      def initialize(app)
+        @app = app
+        @dispose = Dispose.new(@app)
+      end
 
-          # TODO: Rack和Grape验证
-        end
+      def call(env)
+        @dispose.begin_at = DateTime.now.strftime("%Q").to_i
+        status, header, body = @app.call(env)
+        @dispose.write(env, body, status, header)
+        [status, header, body]
       end
+
     end
   end
 end

data/lib/rack/xrk/log.rb

@@ -3,7 +3,7 @@ require 'rack/xrk/log/commonlogger'
 module Rack
   module Xrk
     module Log
-      VERSION = '0.1.4'
+      VERSION = '0.1.5'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_xrk_log
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Louis Liu