fluent-plugin-remote_syslog 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc10c8c7403883b27cca3def44bbaa3c75c652f8
-  data.tar.gz: ea359618ac41bd7dcf70d5e57e2e28696cf3a5c4
+  metadata.gz: f5179d40ceead1e1bb25e858dfd2b0dedbe4e9cb
+  data.tar.gz: 8d3ba77a4b1d7f59c2214ccf82cc19f3e833901b
 SHA512:
-  metadata.gz: b12a5eee1282139e3f856e8e61be8c46eda6c29c92a21a831b0d30fbed36e69dd30c782dd762875974fc8f13ab2507584305c7efeeb44b2a23fbb0856a00848b
-  data.tar.gz: badffc390eced3fd16032c590e9d3c4ed3672098e2f5d26ee975cb4ba4eeea59f3d257d5c3f624987edb646f31a7c2aad3099d336057dd4a9372e83f607210a4
+  metadata.gz: 90968580bcdc9b5bf928f6aab35f867aa6d749fad5e8fb7163333cad5825d71bfc874bad771dea62b7ce8eae0d99c0a7887b03d00f405677abdada4261b7710b
+  data.tar.gz: 9ea571f77eac590be9e31d7c478e15002c5fde3efbe1d130fb4033ad103fef1522fd94655e9bf5f2b47481390ed916b19a50b110db0e66f4d8a59a8c50c66bf3

data/.travis.yml

@@ -1,5 +1,10 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+before_install:
+  - gem update bundler

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/fluent-plugin-remote_syslog.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "test-unit-minitest"
+  spec.add_development_dependency "minitest"
 
   spec.add_runtime_dependency "fluentd"
   spec.add_runtime_dependency "fluent-mixin-plaintextformatter"
   spec.add_runtime_dependency "remote_syslog_logger", "~> 1.0.0"
-  spec.add_runtime_dependency "fluent-mixin-config-placeholders", "~> 0.2.0"
+  spec.add_runtime_dependency "fluent-mixin-config-placeholders"
   spec.add_runtime_dependency "fluent-mixin-rewrite-tag-name"
 end

data/lib/fluent/plugin/out_remote_syslog.rb

@@ -23,21 +23,12 @@ module Fluent
     def initialize
       super
       require "remote_syslog_logger"
-    end
-
-    def configure(conf)
-      super
-      @logger = RemoteSyslogLogger::UdpSender.new(@host,
-                                                  @port,
-                                                  facility: @facility,
-                                                  severity: @severity,
-                                                  program: @tag,
-                                                  local_hostname: @hostname)
+      @loggers = {}
     end
 
     def shutdown
       super
-      @logger.close if @logger
+      @loggers.values.each(&:close)
     end
 
     def emit(tag, es, chain)
@@ -48,10 +39,16 @@ module Fluent
             v.force_encoding("utf-8")
           end
         end
-        emit_tag = tag.dup
-        filter_record(emit_tag, time, record)
 
-        @logger.transmit format(tag, time, record)
+        tag = rewrite_tag!(tag.dup)
+        @loggers[tag] ||= RemoteSyslogLogger::UdpSender.new(@host,
+          @port,
+          facility: @facility,
+          severity: @severity,
+          program: tag,
+          local_hostname: @hostname)
+
+        @loggers[tag].transmit format(tag, time, record)
       end
     end
   end

data/test/plugin/out_remote_syslog.rb

@@ -1,36 +1,62 @@
 require "test_helper"
 require "fluent/plugin/out_remote_syslog"
 
-class RemoteSyslogOutputTest < Test::Unit::TestCase
+class RemoteSyslogOutputTest < MiniTest::Unit::TestCase
   def setup
-    super
     Fluent::Test.setup
   end
 
-  CONFIG = %[
-    type remote_syslog
-    hostname foo.com
-    host example.com
-    port 5566
-    severity debug
-    tag testunit
-  ]
-
-  def create_driver(conf = CONFIG)
-    Fluent::Test::OutputTestDriver.new(Fluent::RemoteSyslogOutput) {}.configure(conf)
+  def create_driver(conf = CONFIG, tag = "test.remote_syslog")
+    Fluent::Test::OutputTestDriver.new(Fluent::RemoteSyslogOutput, tag) {}.configure(conf)
   end
 
   def test_configure
-    d = create_driver
-    logger = d.instance.instance_variable_get(:@logger)
+    d = create_driver %[
+      type remote_syslog
+      hostname foo.com
+      host example.com
+      port 5566
+      severity debug
+      tag minitest
+    ]
+
+    d.run do
+      d.emit(message: "foo")
+    end
+
+    loggers = d.instance.instance_variable_get(:@loggers)
+    refute_empty loggers
+
+    logger = loggers.values.first
 
-    assert_not_nil logger
     assert_equal "example.com", logger.instance_variable_get(:@remote_hostname)
     assert_equal 5566, logger.instance_variable_get(:@remote_port)
+
     p = logger.instance_variable_get(:@packet)
     assert_equal "foo.com", p.hostname
     assert_equal 1, p.facility
-    assert_equal "testunit", p.tag
+    assert_equal "minitest", p.tag
     assert_equal 7, p.severity
   end
+
+  def test_rewrite_tag
+    d = create_driver %[
+      type remote_syslog
+      hostname foo.com
+      host example.com
+      port 5566
+      severity debug
+      tag rewrited.${tag_parts[1]}
+    ]
+
+    d.run do
+      d.emit(message: "foo")
+    end
+
+    loggers = d.instance.instance_variable_get(:@loggers)
+    logger = loggers.values.first
+
+    p = logger.instance_variable_get(:@packet)
+    assert_equal "rewrited.remote_syslog", p.tag
+  end
 end

data/test/test_helper.rb

@@ -1,5 +1,7 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'test/unit'
-require 'fluent/test'
+require "minitest/autorun"
+require "minitest/unit"
+require "minitest/pride"
+require "fluent/test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-remote_syslog
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Richard Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit-minitest
+  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: minitest
+  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: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +98,16 @@ dependencies:
   name: fluent-mixin-config-placeholders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-rewrite-tag-name
   requirement: !ruby/object:Gem::Requirement
@@ -140,4 +168,3 @@ summary: Fluentd output plugin for remote syslog
 test_files:
 - test/plugin/out_remote_syslog.rb
 - test/test_helper.rb
-has_rdoc: