fluent-plugin-utmpx 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90c5cc2703544154608ba4f78eb2073bfee3d22a2e4da53111e4ffea144bb29a
-  data.tar.gz: 46e1a239c01c29ec0aa3043031b859c0968e8cc451aa32a2fc6e2a4c41d81256
+  metadata.gz: 68d3cabe9c9f7865bfb0770959d26e8cca09addf1a8aa5ed33aa1aeda354bc69
+  data.tar.gz: 89b374d79e6c0d296b8dcfc2fe847e19f5354e407a4a36d18449e706f86d08ae
 SHA512:
-  metadata.gz: 209da14c9f6bbe3f52f273bd33dfd5ad57e1bb2dced1e5d933415ec3c11cf3b651d4c90b201d7925016fc3ad487ae7167fd786686b04c3469ea72513b84370b3
-  data.tar.gz: 9da5a80b44b57c6568b55d2e7fb8601d4474910f4b7c5996ec2cdc32103e3bab29b98d2a85712d7924c3694d81fc90d8a22e35ab5d095c0d829a7d20670f0705
+  metadata.gz: d518632c6959910dccb11129beae4b19434920ff407d98606a066cd66555b5836e429f7b8fa4e7e3b94c1cb9a974869093a65a5832b6ad5a90ae7cecb6de0b43
+  data.tar.gz: 0f95670e7e8649b0a1b504a08d92a8f54da3e3f1365764c4c39c99a1eb3a026df569d0b48b2b76ba3a54ce1b94cd190bd5182f2a7c9b06c1e436da70c21d03fa

data/.github/workflows/main.yml

@@ -9,7 +9,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ '2.5', '2.6', '2.7', '3.0' ]
-    name: Ruby ${{ matrix.ruby }} unit testing on ubuntu-latest
+        fluentd: ['1.11.5', '1.12.2']
+    name: Ruby ${{ matrix.ruby }} Fluentd ${{ matrix.fluentd }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -18,6 +19,9 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
     - name: Run the default task
       run: |
-        gem install bundler
-        bundle install
+        gem install fluentd -v ${{ matrix.fluentd }}
+        gem install rake -v 12.0
+        gem install webrick
+        rake build
+        gem install ./pkg/fluent-plugin-utmpx*.gem
         TESTOPTS="--verbose" bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.5.0 (2021-04-02)
+
+* Changed to keep compatibility with Fluentd 1.11 [GitHub#3] [GitHub#4]
+
 ## 0.4.0 (2021-03-31)
 
 * Update to latest linux-utmpx 0.3.0

data/fluent-plugin-utmpx.gemspec

@@ -3,12 +3,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-utmpx"
-  spec.version = "0.4.0"
+  spec.version = "0.5.0"
   spec.authors = ["Kentaro Hayashi"]
   spec.email   = ["kenhys@gmail.com"]
 
-  spec.summary       = %q{Fluentd Parser plugin to parse login records}
-  spec.description   = %q{Fluentd Parser plugin to parse /var/log/wtmp,/var/run/utmp}
+  spec.summary       = %q{Fluentd Input plugin to parse login records}
+  spec.description   = %q{Fluentd Input plugin to parse /var/log/wtmp,/var/run/utmp}
   spec.homepage      = "https://github.com/fluent-plugins-nursery/fluent-plugin-utmpx"
   spec.license       = "Apache-2.0"
 

data/lib/fluent/plugin/in_utmpx.rb

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "fluent/version"
 require "fluent/plugin/input"
 require "fluent/plugin/in_tail/position_file"
 require 'fluent/variable_store'
@@ -22,6 +23,9 @@ Fluent::FileWrapper = File
 
 module Fluent
   module Plugin
+
+    TargetInfo = Struct.new(:path, :ino)
+
     class UtmpxInput < Fluent::Plugin::Input
       Fluent::Plugin.register_input("utmpx", self)
 
@@ -58,15 +62,23 @@ module Fluent
         FileUtils.mkdir_p(pos_file_dir, mode: Fluent::DEFAULT_DIR_PERMISSION) unless Dir.exist?(pos_file_dir)
         @pf_file = File.open(@pos_file, File::RDWR|File::CREAT|File::BINARY, Fluent::DEFAULT_FILE_PERMISSION)
         @pf_file.sync = true
-        target_info = TailInput::TargetInfo.new(@path, Fluent::FileWrapper.stat(@path).ino)
-        @pf = TailInput::PositionFile.load(@pf_file, false, {target_info.path => target_info}, logger: log)
+        target_info = TargetInfo.new(@path, Fluent::FileWrapper.stat(@path).ino)
+        if Gem::Version.new(Fluent::VERSION) < Gem::Version.new("1.12.0")
+          @pf = TailInput::PositionFile.load(@pf_file, logger: log)
+        else
+          @pf = TailInput::PositionFile.load(@pf_file, false, {target_info.path => target_info}, logger: log)
+        end
 
         timer_execute(:execute_utmpx, @interval, &method(:refresh_watchers))
       end
 
       def refresh_watchers
         @tail_position = Fluent::FileWrapper.stat(@path).size
-        @pe = @pf[TailInput::TargetInfo.new(@path, Fluent::FileWrapper.stat(@path).ino)]
+        if Gem::Version.new(Fluent::VERSION) < Gem::Version.new("1.12.0")
+          @pe = @pf[@path]
+        else
+          @pe = @pf[TargetInfo.new(@path, Fluent::FileWrapper.stat(@path).ino)]
+        end
         return if (@tail_position - @pe.read_pos) == 0
 
         if (@tail_position - @pe.read_pos) < 0

data/test/plugin/test_in_utmpx.rb

@@ -85,9 +85,14 @@ class UtmpxInputTest < Test::Unit::TestCase
       create_wtmp
       @tail_position = Fluent::FileWrapper.stat(wtmp_path).size
       File.open(utmpx_pos_path, "w+") do |file|
-        target_info = Fluent::Plugin::TailInput::TargetInfo.new(wtmp_path, Fluent::FileWrapper.stat(wtmp_path).ino)
-        @pf = Fluent::Plugin::TailInput::PositionFile.new(file, false, {wtmp_path => target_info}, logger: nil)
-        @pe = @pf[target_info]
+        target_info = Fluent::Plugin::TargetInfo.new(wtmp_path, Fluent::FileWrapper.stat(wtmp_path).ino)
+        if Gem::Version.new(Fluent::VERSION) < Gem::Version.new("1.12.0")
+          @pf = Fluent::Plugin::TailInput::PositionFile.new(file, logger: nil)
+          @pe = @pf[wtmp_path]
+        else
+          @pf = Fluent::Plugin::TailInput::PositionFile.new(file, false, {wtmp_path => target_info}, logger: nil)
+          @pe = @pf[target_info]
+        end
         @pe.update_pos(@tail_position)
       end
       d = create_driver(utmpx_config(wtmp_path))
@@ -104,9 +109,14 @@ class UtmpxInputTest < Test::Unit::TestCase
       end
       @tail_position = Fluent::FileWrapper.stat(wtmp_path).size
       File.open(utmpx_pos_path, "w+") do |file|
-        target_info = Fluent::Plugin::TailInput::TargetInfo.new(wtmp_path, Fluent::FileWrapper.stat(wtmp_path).ino)
-        @pf = Fluent::Plugin::TailInput::PositionFile.new(file, false, {wtmp_path => target_info}, logger: nil)
-        @pe = @pf[target_info]
+        target_info = Fluent::Plugin::TargetInfo.new(wtmp_path, Fluent::FileWrapper.stat(wtmp_path).ino)
+        if Gem::Version.new(Fluent::VERSION) < Gem::Version.new("1.12.0")
+          @pf = Fluent::Plugin::TailInput::PositionFile.new(file, logger: nil)
+          @pe = @pf[wtmp_path]
+        else
+          @pf = Fluent::Plugin::TailInput::PositionFile.new(file, false, {wtmp_path => target_info}, logger: nil)
+          @pe = @pf[target_info]
+        end
         @pe.update_pos(@tail_position)
       end
       File.open(wtmp_path, "w+") do |file|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-utmpx
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kentaro Hayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux-utmpx
@@ -100,7 +100,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Fluentd Parser plugin to parse /var/log/wtmp,/var/run/utmp
+description: Fluentd Input plugin to parse /var/log/wtmp,/var/run/utmp
 email:
 - kenhys@gmail.com
 executables: []
@@ -146,7 +146,7 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Fluentd Parser plugin to parse login records
+summary: Fluentd Input plugin to parse login records
 test_files:
 - test/fixtures/Makefile
 - test/fixtures/alice_login.dump