logstasher 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6404e64176a9e91e7fe16a4ad2b8a12792dfe3b570f2920ea74cfb3e201c7322
-  data.tar.gz: 1a269a04d2b4adfdb5f01348af44a9b6103cabba7e602df6add73ea538a7ced5
+  metadata.gz: cc18d114cfc41499a37e388cc18a1cf2608ba935e629d6dd7c4bf6f9382bdbf1
+  data.tar.gz: 38646241250be07048968e31e807a5683b7342916d018220eb961465ca014307
 SHA512:
-  metadata.gz: 6b0f34ad6389fa7f9aace7b655a5c81ba04ea4868e46d40f51438ac74eb89fb8f151b5aff3193bc4643cbd29fb7a43399bfaa79d0f7a0fb86715f1ea91774f6a
-  data.tar.gz: a4dd6b70ea93ff535bb562789bf8ed7b083c3dd1cea40ccbd1b160349443b6bc24797797b04b89d441aae7220ddb068b91e2521a472c005d3e9269fbb45f6ce5
+  metadata.gz: 26124c87a8d13d71b0551d79d599eda734c656ad38576895adb59b36d1a093dc350a2a26287f373ecc3dd7782eee1ce4d78ef59a833ca791ce019c940d50e9da
+  data.tar.gz: 02acf571115949f295ff1dd654549bfa8d296df0f6c39ea4ab4631e8b5e5416080381386c3e44891fa1a75d4ebe4e0ad47db367247d6044938a78d0ed221b110

data/lib/logstasher.rb

@@ -6,6 +6,7 @@ require 'logstasher/action_view/log_subscriber' if defined?(ActionView)
 require 'logstasher/active_job/log_subscriber' if defined?(ActiveJob)
 require 'logstasher/rails_ext/action_controller/base'
 require 'logstasher/custom_fields'
+require 'logstasher/event'
 require 'request_store'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
@@ -181,7 +182,7 @@ module LogStasher
     field_renaming.each do |old_name, new_name|
         data[new_name] = data.delete(old_name) if data.key?(old_name)
     end
-    ::LogStash::Event.new(data.merge('source' => self.source, 'tags' => tags))
+    Event.new(data.merge('source' => self.source, 'tags' => tags))
   end
 
   def store

data/lib/logstasher/event.rb

@@ -0,0 +1,35 @@
+require "json"
+require "time"
+require "date"
+
+module LogStasher
+  class Event
+
+    def initialize(data={})
+      @cancelled = false
+
+      @data = data
+      if data.include?("@timestamp")
+        t = data["@timestamp"]
+        if t.is_a?(String)
+          data["@timestamp"] = Time.parse(t).gmtime
+        end
+      else
+        data["@timestamp"] = ::Time.now.utc 
+      end
+      data["@version"] = "1" if !@data.include?("@version")
+    end 
+
+    def to_s
+      to_json.to_s
+    end
+    
+    def to_json(*args)
+      return @data.to_json(*args) 
+    end
+
+    def [](key)
+      @data[key]
+    end
+  end
+end

data/lib/logstasher/railtie.rb

@@ -30,7 +30,8 @@ module LogStasher
         LogStasher.process_config(app.config.logstasher, LOGSTASHER[env].symbolize_keys) if LOGSTASHER.key? env
       end
 
-      app.config.action_dispatch.rack_cache[:verbose] = false if app.config.action_dispatch.rack_cache
+      app.config.action_dispatch.rack_cache[:verbose] = false if rack_cache_hashlike?(app)
+
       LogStasher.setup_before(app.config.logstasher) if app.config.logstasher.enabled
     end
 
@@ -39,6 +40,10 @@ module LogStasher
         LogStasher.setup(config.logstasher) if config.logstasher.enabled
       end
     end
+
+    def rack_cache_hashlike?(app)
+      app.config.action_dispatch.rack_cache && app.config.action_dispatch.rack_cache.respond_to?(:[]=)
+    end
   end
 
   def default_source

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shadab Ahmed
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -123,6 +123,7 @@ files:
 - lib/logstasher/active_support/mailer_log_subscriber.rb
 - lib/logstasher/custom_fields.rb
 - lib/logstasher/device/redis.rb
+- lib/logstasher/event.rb
 - lib/logstasher/rails_ext/action_controller/base.rb
 - lib/logstasher/rails_ext/action_controller/metal/instrumentation.rb
 - lib/logstasher/rails_ext/rack/logger.rb
@@ -132,7 +133,7 @@ homepage: https://github.com/shadabahmed/logstasher
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,9 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Awesome rails logs
 test_files: []