rack-traffic-logger 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca028e1a99d48ccc15d12bbe7173a46b1b10c8c
-  data.tar.gz: 59f69d7fd8ea9ba939d58f9620f68fb7fade8747
+  metadata.gz: 2eb0252e73380f08bce1a1fd885b7d1274efb5ea
+  data.tar.gz: 52c68544ff792ba5a11b98d6eef256f5dedf2bf6
 SHA512:
-  metadata.gz: b404dc7d0092b9c5e3945ac38b992e14eb3cbfa2a204cfb6c60c495ae57235be3cca7631a0174914af25a2fd05ab037612523f59b5ff40aba16469d6e9125364
-  data.tar.gz: 3838f643eae3525c4ca23e3a9602634b8f41958f268f2673627c673de07e844ba558faa9e4e8c9c98b9744c47c9d58e5ebe2fc2964643df418e8a23896fa51b3
+  metadata.gz: 3d4540743bb8c876d8dda6196b32d548044bfac62f7736704f2aa7cef441749debaced16d1fb62a6988b89e272bb67e542b8f43755dd35d77a13babd925deb31
+  data.tar.gz: e4486d2c17aff30b74771273df3a5095dce62c1621101dad5549aca5cce7ac8d116a0d47c11395e87c617c874074fe82e73638207a1bd835bcc6986044017d09

data/lib/rack/traffic_logger.rb

@@ -51,18 +51,21 @@ module Rack
       @default_options ||= PUBLIC_ATTRIBUTES.map { |k, v| [k, v[:default]] }.to_h
     end
 
+    def render(template, data)
+      template.gsub(/:(\w+)/) { data[$1.to_sym] }
+    end
+
     REQUEST_TEMPLATES = {
-        true => "%s %s%s HTTP/%s",
-        false => "%s %s%s HTTP/%s"
+        true => "\e[35m:verb \e[36m:path:qs\e[0m :http",
+        false => ':verb :path:qs :http'
     }
 
     def log_request!(env)
-      debug REQUEST_TEMPLATES[colors] % [
-        env['REQUEST_METHOD'],
-        env['PATH_INFO'],
-        (q = env['QUERY_STRING']).empty? ? '' : "?#{q}",
-        env['HTTP_VERSION'] || '1.1'
-      ]
+      debug render REQUEST_TEMPLATES[colors],
+                   verb: env['REQUEST_METHOD'],
+                   path: env['PATH_INFO'],
+                   qs: (q = env['QUERY_STRING']).empty? ? '' : "?#{q}",
+                   http: env['HTTP_VERSION'] || 'HTTP/1.1'
       log_headers! env_request_headers(env) if request_headers
       input = env['rack.input']
       if request_bodies && input
@@ -72,16 +75,24 @@ module Rack
     end
 
     RESPONSE_TEMPLATES = {
-        true => "HTTP/%s %s %s",
-        false => "HTTP/%s %s %s"
+        true => ":http \e[:color:code \e[36m:status\e[0m",
+        false => ':http :code :status'
     }
 
+    def status_color(status)
+      case (status / 100).to_i
+        when 2 then '32m'
+        when 4, 5 then '31m'
+        else '33m'
+      end
+    end
+
     def log_response!(env, response)
-      debug RESPONSE_TEMPLATES[colors] % [
-          env['HTTP_VERSION'] || '1.1',
-          code = response[0],
-          Rack::Utils::HTTP_STATUS_CODES[code]
-      ]
+      debug render RESPONSE_TEMPLATES[colors],
+                   http: env['HTTP_VERSION'] || 'HTTP/1.1',
+                   code: code = response[0],
+                   status: Rack::Utils::HTTP_STATUS_CODES[code],
+                   color: status_color(code)
       log_headers! response[1] if response_headers
       log_body! response[2].join if response_bodies
     end
@@ -91,17 +102,17 @@ module Rack
     end
 
     HEADER_TEMPLATES = {
-        true => "%s: %s\n",
-        false => "%s: %s\n"
+        true => "\e[4m:key\e[0m: :val\n",
+        false => ":key: :val\n"
     }
 
     def log_headers!(headers)
-      info headers.map { |k, v| HEADER_TEMPLATES[colors] % [k, v] }.join
+      info headers.map { |k, v| render HEADER_TEMPLATES[colors], key: k, val: v }.join
     end
 
     def env_request_headers(env)
       env.select do |k, _|
-        k =~ /^(CONTENT|HTTP)_/
+        k =~ /^(CONTENT|HTTP)_(?!VERSION)/
       end.map do |(k, v)|
         [
             k.sub(/^HTTP_/, '').split(/[_ -]/).map do |word|

data/lib/rack/traffic_logger/echo.rb

@@ -5,7 +5,15 @@ module Rack
   class TrafficLogger
     class Echo
       def call(env)
-        JSON.parse env['rack.input'].tap(&:rewind).read
+        begin
+          JSON.parse env['rack.input'].tap(&:rewind).read
+        rescue JSON::ParserError => error
+          [
+              500,
+              {'Content-Type' => 'text/plain;charset=UTF-8'},
+              [error.message]
+          ]
+        end
       end
     end
   end

data/lib/rack/traffic_logger/logger.rb

@@ -4,6 +4,22 @@ module Rack
   class TrafficLogger
     class Logger < ::Logger
 
+      def initialize(*args)
+        super *args
+        @default_formatter = Formatter.new
+      end
+
+      class Formatter
+
+        def call(severity, time, progname, msg)
+          if severity == 'INFO'
+            "#{msg}\n"
+          else
+            "@ #{time.strftime '%a %d %b \'%y %T'}.#{'%d' % (time.usec / 1e4)}\n#{msg}\n"
+          end
+        end
+
+      end
     end
   end
 end

data/lib/rack/traffic_logger/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class TrafficLogger
-    VERSION = '0.0.1'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-traffic-logger
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Neil E. Pearson