fluent-plugin-airbrake-logger 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1490f1bf0c515799878049536f1cfda972f8cc2b
-  data.tar.gz: 86d57218a3e4e6575a916c5fcf4b50518d1c677f
+  metadata.gz: ee581109b0421a8c7c8dddab9339e06cdcad63c1
+  data.tar.gz: ad07df2ebc76fd13c9a31fa3093172cd80955c07
 SHA512:
-  metadata.gz: 2976f851bc615ad454e429a59cd0d352de60097834016919a3c1dcbb9bf756b3b8677d1e36f6f041ae25faf6efb5c1c90a63c1a8252216f47a0340ea16e06a1d
-  data.tar.gz: fdbca7e359179aec280affdf26ccae383af8750b95cdb1a36d4cf3079be39ab3330d1134c7a3186e2d2741cfca1d58db5fd1d8b40766bb59d005d119f15902ea
+  metadata.gz: 5a6a57f04e6803245107251d9606a4da8329f6fb0c5700411d5182b227a4851dd6440a699ec508318035523f63285c3c8abeaf48f4be6cc3438a1d7699f1e967
+  data.tar.gz: f0f1f4c0b3200c7e4a491b1a6392c0ee45611d9625cb1ddd48641dcd94aab5a03f74d5834b676c86e11b1a24f2336c41bc58badb8f28da2b741096d18cdc9d5e

data/fluent-plugin-airbrake-logger.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-airbrake-logger"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Shuichi Ohsawa"]
   spec.email         = ["ohsawa0515@gmail.com"]
 
-  spec.summary       = %q{Output filter plugin to Airbrake(Errbit) by fluent-logger}
-  spec.description   = %q{Output filter plugin to Airbrake(Errbit) by fluent-logger}
+  spec.summary       = %q{Fluent output plugin to Airbrake(Errbit) by fluent-logger}
+  spec.description   = %q{Fluent output plugin to Airbrake(Errbit) by fluent-logger}
   spec.homepage      = "https://github.com/ohsawa0515/fluent-plugin-airbrake-logger"
   spec.license       = "MIT"
 

data/lib/fluent/plugin/out_airbrake_logger.rb

@@ -1,7 +1,7 @@
-class Fluent::ErrbitGeesOutput < Fluent::Output
+class Fluent::AirbrakeLoggerOutput < Fluent::Output
   Fluent::Plugin.register_output('airbrake_logger', self)
 
-  LOGLEVEL_MAP = {
+  LOG_LEVEL_MAP = {
     'CRITICAL' => 50,
     'FATAL'    => 50,
     'ERROR'    => 40,
@@ -11,6 +11,8 @@ class Fluent::ErrbitGeesOutput < Fluent::Output
     'DEBUG'    => 10
   }
 
+  CUT_OFF_CHAR = 60
+
   config_param :api_key, :string, :default => nil
   config_param :host, :string, :default => 'localhost'
   config_param :port, :integer, :default => '80'
@@ -39,9 +41,17 @@ class Fluent::ErrbitGeesOutput < Fluent::Output
   config_param :user_attributes, :string, :default => nil
   config_param :framework, :string, :default => nil
   config_param :project_id, :string, :default => nil
-  config_param :loglevel, :string, :default => 'DEBUG'
+  config_param :log_level, :string, :default => 'DEBUG'
   config_param :log_path, :string, :default => nil
 
+  # record parameters
+  config_param :log_level_record, :string, :default => 'severity'
+  config_param :error_class_record, :string, :default => 'error_class'
+  config_param :batcktrace_record, :string, :default => 'error_backtrace'
+  config_param :error_message_record, :string, :default => 'error_message'
+  config_param :component_record, :string, :default => 'component'
+  config_param :action_record, :string, :default => 'action'
+
   def initialize
     super
     require 'airbrake'
@@ -78,22 +88,28 @@ class Fluent::ErrbitGeesOutput < Fluent::Output
     end
 
     @sender = Airbrake::Sender.new(@aconf)
-    @loglevel = LOGLEVEL_MAP[@loglevel.upcase]
+    @log_level = LOG_LEVEL_MAP[@log_level.upcase]
   end
 
   def notification_needed(_tag, _time, record)
-    severity_map = LOGLEVEL_MAP[record['severity']]
+    severity_map = LOG_LEVEL_MAP[record[@log_level_record].upcase]
 
-    record['severity'] ? severity_map >= @loglevel : false
+    record[@log_level_record] ? severity_map >= @log_level : false
   end
 
   def build_error_message(record)
-    error_message = record['error_message'] ? record['error_message'] : 'Notification'
-    "[#{record['severity']}] #{error_message}"
+    error_message = record[@error_message_record] ? cut_down_message(record[@error_message_record]) :
+      (record['message'] ? cut_down_message(record['message']) : 'Notification')
+    "[#{record[@log_level_record]}] #{record[@error_class_record]} #{error_message}"
+  end
+
+  def cut_down_message(message)
+    message_to_s = message.is_a?(Array) ? message.join : message
+    message_to_s[0, CUT_OFF_CHAR]
   end
 
   def build_error_backtrace(record)
-    return record['error_backtrace'] ? record['error_backtrace'] : (record['backtrace'] ? record['backtrace'] : "")
+    record[@batcktrace_record] ? record[@batcktrace_record] : (record['backtrace'] ? record['backtrace'] : "")
   end
 
   def emit(tag, es, chain)
@@ -101,16 +117,18 @@ class Fluent::ErrbitGeesOutput < Fluent::Output
 
       next unless notification_needed(tag, time, record)
 
-      other_record = record.reject {|k, _| %w(error_class error_backtrace error_message application_name service_name).include?(k) }
+      other_record = record.reject {|k, _|
+        %W(#{@log_level_record} #{@error_class_record} #{@batcktrace_record}
+           #{@error_message_record} #{@component_record} #{@action_record} backtrace message).include?(k) }
 
       @notice  = Airbrake::Notice.new(@aconf.merge(
         :api_key       => @api_key,
-        :error_class   => record['error_class'],
+        :error_class   => record[@error_class_record],
         :backtrace     => build_error_backtrace(record),
         :error_message => build_error_message(record),
         :hostname      => record['hostname'],
-        :component     => record['application_name'],
-        :action        => record['service_name'],
+        :component     => record[@component_record],
+        :action        => record[@action_record],
         :cgi_data      => other_record
       ))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-airbrake-logger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Shuichi Ohsawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
-description: Output filter plugin to Airbrake(Errbit) by fluent-logger
+description: Fluent output plugin to Airbrake(Errbit) by fluent-logger
 email:
 - ohsawa0515@gmail.com
 executables: []
@@ -118,5 +118,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Output filter plugin to Airbrake(Errbit) by fluent-logger
+summary: Fluent output plugin to Airbrake(Errbit) by fluent-logger
 test_files: []