fluent-plugin-notifier 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819e0e5c533b1b364de48803a65dd2b576cb754f
-  data.tar.gz: fd4e2261616683930ba6d90b7261bbc502ff85ae
+  metadata.gz: 51bbc47ed97c53bc01c97c23c0e207f34c25b082
+  data.tar.gz: 86e03386b945389577efdde8cddb313f0fddc741
 SHA512:
-  metadata.gz: 4c4a68ea9a7028d285eea418503759b47dacc959ef3f96187ec60eb586817d51de0e4446766d48c2edfeb5f41cea6576c41ac4c3951d0add4efde509a9230304
-  data.tar.gz: 37e8b7d8d0cd28de54c6d0b66bf67ad0c73e049e6705490953146fc77f89aecc2fb3cf4f0c1277e41400edba489edd7b1b4e9ed00e6cbd4cab5054531d84dec7
+  metadata.gz: a61e5437151977331a9688057fe50bcbad4695584188bd7181550582108de45e2a03834355fb095a3aa04289bd6b6f8289fc2ce5021d4c6de95d0a008f5a24aa
+  data.tar.gz: 44cd882c4c4b9bca4ff6449c40d167be30695ac55cd5d4d7210376dcf198920dfd91cd73fc03881b7b314ad8fc4e3e88459b8a05182f2a1f5d8af65e7238c4be

data/fluent-plugin-notifier.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-notifier"
-  gem.version       = "0.2.3"
+  gem.version       = "0.2.4"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{check matched messages and emit alert message}
@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_development_dependency "test-unit"
   gem.add_development_dependency "rake"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/out_notifier.rb

@@ -401,7 +401,7 @@ class Fluent::NotifierOutput < Fluent::Output
         end
       when :find
         str = record[key].to_s
-        if @crit_regexp and @crit_regexp.match(str)
+        if match(@crit_regexp, str)
           {
             :hashkey => @pattern + "\t" + tag + "\t" + key,
             :match_def => self,
@@ -409,7 +409,7 @@ class Fluent::NotifierOutput < Fluent::Output
             'pattern' => @pattern, 'target_tag' => tag, 'target_key' => key, 'check_type' => 'string_find', 'level' => 'crit',
             'regexp' => @crit_regexp.inspect, 'value' => str, 'message_time' => Time.at(time).to_s
           }
-        elsif @warn_regexp and @warn_regexp.match(str)
+        elsif match(@warn_regexp, str)
           {
             :hashkey => @pattern + "\t" + tag + "\t" + key,
             :match_def => self,
@@ -424,6 +424,20 @@ class Fluent::NotifierOutput < Fluent::Output
         raise ArgumentError, "unknown check type (maybe bug): #{@check}"
       end
     end
+
+    def match(regexp,string)
+      regexp && regexp.match(string)
+    rescue ArgumentError => e
+      raise e unless e.message.index("invalid byte sequence in") == 0
+      replaced_string = replace_invalid_byte(string)
+      regexp.match(replaced_string)
+    end
+
+    def replace_invalid_byte(string)
+       replace_options = { invalid: :replace, undef: :replace, replace: '?' }
+       temporal_encoding = (string.encoding == Encoding::UTF_8 ? Encoding::UTF_16BE : Encoding::UTF_8)
+       string.encode(temporal_encoding, string.encoding, replace_options).encode(string.encoding)
+    end
   end
 
   class State

data/test/plugin/test_out_notifier.rb

@@ -1,6 +1,10 @@
 require 'helper'
 
 class NotifierOutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
   CONFIG = %[
   type notifier
   input_tag_remove_prefix test
@@ -108,4 +112,14 @@ class NotifierOutputTest < Test::Unit::TestCase
     end
     assert_equal 0, d.emits.size
   end
+
+  def test_emit_invalid_byte
+    invalid_utf8 = "\xff".force_encoding('UTF-8')
+    d = create_driver
+    assert_nothing_raised {
+      d.run do
+        d.emit({'num1' => 60, 'message' => "foo bar WARNING #{invalid_utf8}", 'numfield' => '30', 'textfield' => 'TargetX'})
+      end
+    }
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-notifier
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: check matched messages and emit alert message
@@ -88,3 +102,4 @@ test_files:
 - test/plugin/test_out_notifier.rb
 - test/plugin/test_state.rb
 - test/plugin/test_test.rb
+has_rdoc: