fluent-plugin-systemd 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b743a85ec91f64910f7c323a6ac9c3ba2f3dc8be
-  data.tar.gz: df1ca5c2c12b2d46e7d97fc03dc7c8c6fedf388e
+  metadata.gz: 2c916a4987e289cd265209f8fe4ff5548dde671a
+  data.tar.gz: 2ba1b869f8cc9efa006c02559ea238a4404f65c4
 SHA512:
-  metadata.gz: 8c9e624bc2f7ee2d996b28180d7fd9dbf46748b9f3d45dc65b6ad90bbedf57da2b44a72e25db87782f1f02dd00f8f1af14eb1b5a30205cf953ec0e0e8a8ea8e0
-  data.tar.gz: 624889ccba1c2176c71fd763699cc57470136820f4afa2a8241a61a7fe7586cfebe3d499bf7a65dd531fbfa0d1680b3041802a56c5e501f64087f39ba95a4eae
+  metadata.gz: ab17ffe10ba7f10b4decbc1723981c9f806cab8bf6a83a86cec461b7b628acebc68fa001acb597a5ee07f6b808cdd8bb705bf1f5cd25aec0070c2e2230cdd3ef
+  data.tar.gz: a37e74273f2c7b56755a4b4d4d78a8058ace1b9fe2b1115311a41cb2a6b05710f567d8883f1302c0451a7d138a760f1b1174bf5753fc7fd75278254f902c7ad7

data/README.md

@@ -26,11 +26,11 @@ if you are using fluentd v0.14 for the latest and greatest features
 
 Simply use RubyGems:
 
-    gem install fluent-plugin-systemd -v 0.0.6
+    gem install fluent-plugin-systemd -v 0.0.7
 
     or
 
-    td-agent-gem install fluent-plugin-systemd -v 0.0.6
+    td-agent-gem install fluent-plugin-systemd -v 0.0.7
 
 ## Configuration
 

data/lib/fluent/plugin/in_systemd.rb

@@ -16,9 +16,6 @@ module Fluent
     def configure(conf)
       super
       @pos_writer = PosWriter.new(@pos_file)
-      @journal = Systemd::Journal.new(path: @path)
-      @journal.filter(*@filters)
-      seek
     end
 
     def start
@@ -37,6 +34,15 @@ module Fluent
 
     private
 
+    def init_journal
+      @journal = Systemd::Journal.new(path: @path)
+      # make sure initial call to wait doesn't return :invalidate
+      # see https://github.com/ledbettj/systemd-journal/issues/70
+      @journal.wait(0)
+      @journal.filter(*@filters)
+      seek
+    end
+
     def seek
       seek_to(@pos_writer.cursor || read_from)
     rescue Systemd::JournalError
@@ -59,6 +65,7 @@ module Fluent
     end
 
     def run
+      init_journal
       Thread.current.abort_on_exception = true
       watch do |entry|
         begin
@@ -76,11 +83,13 @@ module Fluent
 
     def watch
       while @running
-        next unless @journal.wait(1_000_000)
+        init_journal if @journal.wait(0) == :invalidate
         while @journal.move_next && @running
           yield @journal.current_entry
           @pos_writer.update(@journal.cursor)
         end
+        # prevent a loop of death
+        sleep 1
       end
     end
   end

data/lib/fluent/plugin/systemd/pos_writer.rb

@@ -27,7 +27,6 @@ module Fluent
       end
 
       def update(c)
-        return unless @path
         @lock.synchronize { @cursor = c }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-systemd
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,18 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
 - LICENCE
 - README.md
-- Rakefile
-- fluent-plugin-systemd.gemspec
 - lib/fluent/plugin/in_systemd.rb
 - lib/fluent/plugin/systemd/pos_writer.rb
-- pkg/fluent-plugin-systemd-0.0.3.gem
-- pkg/fluent-plugin-systemd-0.0.4.gem
-- pkg/fluent-plugin-systemd-0.0.5.gem
-- pkg/fluent-plugin-systemd-0.1.0.gem
 homepage: https://github.com/reevoo/fluent-plugin-systemd
 licenses:
 - MIT
@@ -133,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Input plugin to read from systemd journal.

data/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-gem "fluentd", "0.12.31"
-gemspec

data/Gemfile.lock

@@ -1,67 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-systemd (0.0.6)
-      fluentd (~> 0.12)
-      systemd-journal (~> 1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.3.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    cool.io (1.4.5)
-    ffi (1.9.17)
-    fluentd (0.12.31)
-      cool.io (>= 1.2.2, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
-      json (>= 1.4.3)
-      msgpack (>= 0.5.11, < 0.6.0)
-      sigdump (~> 0.2.2)
-      string-scrub (>= 0.0.3, <= 0.0.5)
-      tzinfo (>= 1.0.0)
-      tzinfo-data (>= 1.0.0)
-      yajl-ruby (~> 1.0)
-    http_parser.rb (0.6.0)
-    json (2.0.3)
-    msgpack (0.5.12)
-    parser (2.3.3.1)
-      ast (~> 2.2)
-    powerpack (0.0.9)
-    rainbow (2.2.1)
-    rake (12.0.0)
-    reevoocop (0.0.9)
-      rubocop (= 0.28.0)
-    rubocop (0.28.0)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.8.1)
-    sigdump (0.2.4)
-    string-scrub (0.0.5)
-    systemd-journal (1.2.3)
-      ffi (~> 1.9)
-    test-unit (2.5.5)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2016.10)
-      tzinfo (>= 1.0.0)
-    yajl-ruby (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.10)
-  fluent-plugin-systemd!
-  fluentd (= 0.12.31)
-  rake
-  reevoocop
-  test-unit (~> 2.5)
-
-BUNDLED WITH
-   1.13.2

data/Rakefile

@@ -1,31 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-require "reevoocop/rake_task"
-require "fileutils"
-
-ReevooCop::RakeTask.new(:reevoocop)
-
-Rake::TestTask.new(:test) do |t|
-  t.test_files = Dir["test/**/test_*.rb"]
-end
-
-task default: "docker:test"
-task build: "docker:test"
-task default: :reevoocop
-
-namespace :docker do
-  distros = [:ubuntu, :"tdagent-ubuntu", :"tdagent-centos"]
-  task test: distros
-
-  distros.each do |distro|
-    task distro do
-      puts "testing on #{distro}"
-      begin
-        FileUtils.cp("test/docker/Dockerfile.#{distro}", "Dockerfile")
-        sh "docker build ."
-      ensure
-        FileUtils.rm("Dockerfile")
-      end
-    end
-  end
-end

data/fluent-plugin-systemd.gemspec

@@ -1,28 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name          = "fluent-plugin-systemd"
-  spec.version       = "0.0.6"
-  spec.authors       = ["Ed Robinson"]
-  spec.email         = ["ed@reevoo.com"]
-
-  spec.summary       = "Input plugin to read from systemd journal."
-  spec.description   = "This is a fluentd input plugin. It reads logs from the systemd journal."
-  spec.homepage      = "https://github.com/reevoo/fluent-plugin-systemd"
-  spec.license       = "MIT"
-
-
-  spec.files         = Dir["**/**"].reject { |f| f.match(/^(test|spec|features)\//) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit", "~> 2.5"
-  spec.add_development_dependency "reevoocop"
-
-  spec.add_runtime_dependency "fluentd", "~> 0.12"
-  spec.add_runtime_dependency "systemd-journal", "~> 1.2"
-end