onelinejson 0.0.7 → 0.0.8

data/lib/onelinejson.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "onelinejson/version"
 require 'json'
 require 'lograge'
@@ -6,6 +7,46 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 
 module Onelinejson
+  REJECTED_HEADERS = [
+    /^HTTP_CACHE_.+/,
+    /^HTTP_CONNECTION$/,
+    /^HTTP_VERSION$/,
+    /^HTTP_PRAGMA$/,
+    /^HTTP_ACCEPT_LANGUAGE$/,
+    /^HTTP_REFERER$/,
+    /^HTTP_COOKIE$/,
+    /^HTTP_AUTHORIZATION$/,
+    /.*HIDDEN.*/,
+  ]
+  ELIP = "\xe2\x80\xa6"
+  LOG_MAX_LENGTH = 1900
+
+  def self.trim_values(hash, trim_to)
+    Hash[hash.map do |k, v|
+      if v.is_a? String
+        trimmed = if v.size > trim_to
+          v[0, trim_to] + ELIP
+        else
+          v
+        end
+        [k, trimmed]
+      else
+        [k, v]
+      end
+    end]
+  end
+
+  def self.enforce_max_json_length(hash)
+    return hash if JSON.dump(hash).size <= LOG_MAX_LENGTH
+
+    deleted = hash[:request].delete(:params) || hash[:request].delete(:headers)
+    if deleted
+      enforce_max_json_length(hash)
+    else
+      hash
+    end
+  end
+
   module AppControllerMethods
     def append_info_to_payload(payload)
       super
@@ -13,21 +54,23 @@ module Onelinejson
         request.headers.env
       elsif request.headers.respond_to?(:to_hash)
         request.headers.to_hash
-      end.reject do |k, v|
-        !k.starts_with?("HTTP_") || k == "HTTP_AUTHORIZATION" || k.include?("HIDDEN")
+      end.select do |k, v|
+        k =~ /^HTTP_/ && !REJECTED_HEADERS.any? {|regex| k =~ regex}
       end
       parameters = params.reject do |k,v|
         k == 'controller' ||
           k == 'action' ||
-          v.is_a?(ActionDispatch::Http::UploadedFile)
+          v.is_a?(ActionDispatch::Http::UploadedFile) ||
+          v.is_a?(Hash)
       end
 
       payload[:request] = {
-        params: parameters,
+        params: Onelinejson.trim_values(parameters, 128),
         headers: headers,
         ip: request.ip,
         uuid: request.env['action_dispatch.request_id'],
         controller: self.class.name,
+        action: action_name,
         date: Time.now.utc.iso8601,
       }
       u_id = @current_user_id || (@current_user && @current_user.id)
@@ -38,21 +81,23 @@ module Onelinejson
   end
 
   class Railtie < Rails::Railtie
+    config.log_tags = nil
     config.lograge = ActiveSupport::OrderedOptions.new
     config.lograge.formatter = ::Lograge::Formatters::Json.new
     config.lograge.enabled = true
     config.lograge.before_format = lambda do |data, payload|
       request = data.select{ |k,_|
-        [:method, :path, :format, :action].include?(k)
+        [:method, :path, :format].include?(k)
       }.merge(payload[:request])
       response = data.select{ |k,_|
         [:status, :duration, :view, :view_runtime].include?(k)
       }
-      {
-        debug_info: payload[:debug_info] || {},
-        request: request,
-        response: response,
-      }
+      Onelinejson.enforce_max_json_length(
+        {
+          debug_info: payload[:debug_info] || {},
+          request: request,
+          response: response,
+        })
     end
 
     ActiveSupport.on_load(:action_controller) do

data/lib/onelinejson/version.rb

@@ -1,3 +1,3 @@
 module Onelinejson
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onelinejson
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lograge