logstasher 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdbb1f20cf68e8fbe11c54a8f036a4306e3ea298
-  data.tar.gz: 13fe5a49bece9ce24864711ab9998e02305d9490
+  metadata.gz: a6c6fc0a02454a4b8dba0d6b7382aa9e9f4472fb
+  data.tar.gz: 94d05b1358dd0bc32e2c629a8d9d1c041664a8f1
 SHA512:
-  metadata.gz: d6e0170213a368025a4ec1bc04ce682ed31827006288c28f003cfa469945706017f189f353e35e72310bdc7a78807049b9e4dca38fa0cd80396a7568f1b72176
-  data.tar.gz: d36293ed895eac912267708acb408e30815793689cb9f8ef4be78e4c6808ee58e3ef31f6ace71bce7aed61b91ff5735fc650a37a3fd8475f8c0433b07372f9e3
+  metadata.gz: e9187bae7a6a01d58601d8beacafeb6cd6624d750d12c928c4450f6e3aa89eb6792fa5634161e26be79dac1a72a6e014f2d4585247ff41184ae35ec1a34cec40
+  data.tar.gz: fb2dcf41ab0cf0f13a083d6a27c8eda0a9d5667917d0bd9ab2c9e918f272c35fdbef0f2208b1f5ddfca16ec56b9dfbea9c807c474ff27889b87077006ed3a6de

data/lib/logstasher.rb

@@ -151,15 +151,33 @@ module LogStasher
     Thread.current[:logstasher_custom_fields] = val
   end
 
-  def log(severity, msg)
+  # Log an arbitrary message.
+  #
+  # Usually invoked by the level-based wrapper methods defined below.
+  #
+  # Examples
+  #
+  #   LogStasher.info("message")
+  #   LogStasher.info("message", tags:"tag1")
+  #   LogStasher.info("message", tags:["tag1", "tag2"])
+  #   LogStasher.info("message", timing:1234)
+  #   LogStasher.info(custom1:"yes", custom2:"no")
+  def log(severity, message, additional_fields={})
     if self.logger && self.logger.send("#{severity}?")
+
       data = {'level' => severity}
-      if msg.respond_to?(:to_hash)
-        data.merge!(msg.to_hash)
+      if message.respond_to?(:to_hash)
+        data.merge!(message.to_hash)
       else
-        data['message'] = msg
+        data['message'] = message
       end
-      self.logger << build_logstash_event(data, ['log']).to_json + "\n"
+
+      # tags get special handling
+      tags = Array(additional_fields.delete(:tags) || 'log')
+
+      data.merge!(additional_fields)
+      self.logger << build_logstash_event(data, tags).to_json + "\n"
+
     end
   end
 
@@ -189,8 +207,8 @@ module LogStasher
 
   %w( fatal error warn info debug unknown ).each do |severity|
     eval <<-EOM, nil, __FILE__, __LINE__ + 1
-      def #{severity}(msg)
-        self.log(:#{severity}, msg)
+      def #{severity}(message=nil, additional_fields={})
+        self.log(:#{severity}, message, additional_fields)
       end
     EOM
   end

data/lib/logstasher/active_record/log_subscriber.rb

@@ -5,8 +5,9 @@ module LogStasher
   module ActiveRecord
     class LogSubscriber < ::ActiveRecord::LogSubscriber
       def identity(event)
-        if logger
-          logger << logstash_event(event).to_json + "\n"
+        lsevent = logstash_event(event)
+        if logger && lsevent
+          logger << lsevent.to_json + "\n"
         end
       end
       alias :sql :identity
@@ -28,8 +29,8 @@ module LogStasher
         data.merge! request_context
         data.merge! extract_custom_fields(data)
 
-        tags = ['request']
-        tags.push('exception') if payload[:exception]
+        tags = [ 'request' ]
+        tags.push('exception') if data[:exception]
         LogStasher.build_logstash_event(data, tags)
       end
 

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "0.8.0"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event