logstasher 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11247b1380b660b07d61c1ba3cb09a03e9c73c19
-  data.tar.gz: ad2c0ec6e3ba892c970646bc01f8afeecaa61a89
+  metadata.gz: 1310d59f79f4794fe052862abab980070abbb608
+  data.tar.gz: 8c3ba40e9e3cb8adf4cffe4ce1253bdda0687dc4
 SHA512:
-  metadata.gz: f06b0803dffdb63f6e971ce000b16346488243a092ff32ee2dbbbcc636cca1cc4bdc66f766507365c109da407fe73f92b622e17ca04668f805dff2ee254e7be6
-  data.tar.gz: c1ef1086dd6b3ddb32fa1c1e9b480bfbedc4d6d4e9508eb34a2820e32d18de24de498554c90416e6da5ba4007debc6ddf997d33129d1fb5621238a8843437cbd
+  metadata.gz: 8ac20d33342fb3576d7bdbdb097d251b764ec79e1ae30d38892cf4697aa3873ed3b785dbe96fb9d069857a21a51856de380daf758a9c408015ff8c4a06c31b4b
+  data.tar.gz: a64a27166802d4538d120a8d53386c10e3fed3d64e8916da027adce0b11b91ca415a85817879df73065546b8e98466209f8c09e31b628d72f430100d3c37f632

data/lib/logstasher.rb

@@ -116,11 +116,20 @@ module LogStasher
 
   def log(severity, msg)
     if self.logger && self.logger.send("#{severity}?")
-      event = LogStash::Event.new('@source' => self.source, '@fields' => {:message => msg, :level => severity}, '@tags' => ['log'])
-      self.logger << event.to_json + "\n"
+      data = {'level' => severity}
+      if msg.respond_to?(:to_hash)
+        data.merge!(msg.to_hash)
+      else
+        data['message'] = msg
+      end
+      self.logger << build_logstash_event(data, ['log']).to_json + "\n"
     end
   end
 
+  def build_logstash_event(data, tags)
+    LogStash::Event.new(data.merge('source' => self.source, 'tags' => tags))
+  end
+
   def store
     if RequestStore.store[STORE_KEY].nil?
       # Get each store it's own private Hash instance.
@@ -156,7 +165,9 @@ module LogStasher
   private
 
   def new_logger(path)
-    FileUtils.touch path # prevent autocreate messages in log
+    if path.is_a? String
+      FileUtils.touch path # prevent autocreate messages in log
+    end
     Logger.new path
   end
 end

data/lib/logstasher/log_subscriber.rb

@@ -15,8 +15,8 @@ module LogStasher
 
       tags = ['request']
       tags.push('exception') if payload[:exception]
-      event = LogStash::Event.new(data.merge('source' => LogStasher.source, 'tags' => tags))
-      LogStasher.logger << event.to_json + "\n"
+
+      LogStasher.logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
     end
 
     def redirect_to(event)
@@ -122,8 +122,7 @@ module LogStasher
 
     def process_event(event, tags)
       data = LogStasher.request_context.merge(extract_metadata(event.payload))
-      event = LogStash::Event.new(data.merge('source' => LogStasher.source, 'tags' => tags))
-      logger << event.to_json + "\n"
+      logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
     end
 
     def extract_metadata(payload)

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Awesome rails logs