fluent-plugin-systemd 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ef99806c3d56bcdc8988de35331f23cdd1720f2
-  data.tar.gz: 6a71459493bbc7a522ffa903d6968749e545057d
+  metadata.gz: b743a85ec91f64910f7c323a6ac9c3ba2f3dc8be
+  data.tar.gz: df1ca5c2c12b2d46e7d97fc03dc7c8c6fedf388e
 SHA512:
-  metadata.gz: 01b4fa6a252a234113b2d94746a08e87f05879f9141f82195235221e20971ba3e4a9c69056fe2d6fcec07dc928f5f28ad0d2d8e454bcee031c6d77b64573647d
-  data.tar.gz: 937e956bbeffbe21443c6669ed35cabd17fe0a692468f0c25679fcc2cdae1b971324f7417405c59d715b3250f5dd138818d8790e84fab84dfc40dfbf6fc44c0f
+  metadata.gz: 8c9e624bc2f7ee2d996b28180d7fd9dbf46748b9f3d45dc65b6ad90bbedf57da2b44a72e25db87782f1f02dd00f8f1af14eb1b5a30205cf953ec0e0e8a8ea8e0
+  data.tar.gz: 624889ccba1c2176c71fd763699cc57470136820f4afa2a8241a61a7fe7586cfebe3d499bf7a65dd531fbfa0d1680b3041802a56c5e501f64087f39ba95a4eae

data/Gemfile

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

data/Gemfile.lock

@@ -1,38 +1,37 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-systemd (0.0.5)
+    fluent-plugin-systemd (0.0.6)
       fluentd (~> 0.12)
       systemd-journal (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.2.0)
+    ast (2.3.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    cool.io (1.4.4)
-    ffi (1.9.14)
-    fluentd (0.14.2)
-      cool.io (>= 1.4.3, < 2.0.0)
+    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.7.0)
-      serverengine (>= 1.6.4)
+      msgpack (>= 0.5.11, < 0.6.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.1.7)
+      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.2)
-    msgpack (1.0.0)
-    parser (2.3.1.0)
+    json (2.0.3)
+    msgpack (0.5.12)
+    parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.0.9)
-    rainbow (2.1.0)
-    rake (10.5.0)
-    reevoocop (0.0.8)
+    rainbow (2.2.1)
+    rake (12.0.0)
+    reevoocop (0.0.9)
       rubocop (= 0.28.0)
     rubocop (0.28.0)
       astrolabe (~> 1.3)
@@ -40,20 +39,18 @@ GEM
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.8.0)
-    serverengine (1.6.4)
-      sigdump (~> 0.2.2)
+    ruby-progressbar (1.8.1)
     sigdump (0.2.4)
-    strptime (0.1.8)
-    systemd-journal (1.2.2)
-      ffi (~> 1.9.0)
+    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.6)
+    tzinfo-data (1.2016.10)
       tzinfo (>= 1.0.0)
-    yajl-ruby (1.2.1)
+    yajl-ruby (1.3.0)
 
 PLATFORMS
   ruby
@@ -61,7 +58,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.10)
   fluent-plugin-systemd!
-  rake (~> 10.4)
+  fluentd (= 0.12.31)
+  rake
   reevoocop
   test-unit (~> 2.5)
 

data/README.md

@@ -2,6 +2,22 @@
 
 [![Build Status](https://travis-ci.org/reevoo/fluent-plugin-systemd.svg?branch=master)](https://travis-ci.org/reevoo/fluent-plugin-systemd) [![Code Climate GPA](https://codeclimate.com/github/reevoo/fluent-plugin-systemd/badges/gpa.svg)](https://codeclimate.com/github/reevoo/fluent-plugin-systemd) [![Gem Version](https://badge.fury.io/rb/fluent-plugin-systemd.svg)](https://rubygems.org/gems/fluent-plugin-systemd)
 
+# Requirements <a name="requirements"></a>
+
+
+|fluent-plugin-systemd|fluentd|ruby|
+|----|----|----|
+| 0.1.x | >= 0.14.11, < 2 | >= 2.1 |
+| 0.0.x | ~> 0.12.0 | >= 1.9  |
+
+## WARNING
+this is the maintenance branch for the **0.0.x** series that supports fluentd
+v0.12.x we plan to backport commits from master at least until td-agent is
+based on fluentd v0.14
+
+please install the [0.1.x release](https://github.com/reevoo/fluent-plugin-systemd)
+if you are using fluentd v0.14 for the latest and greatest features
+
 ## Overview
 
 **systemd** input plugin reads logs from the systemd journal
@@ -10,20 +26,16 @@
 
 Simply use RubyGems:
 
-    gem install fluent-plugin-systemd -v 0.0.5
-
-    or
-
-    fluent-gem install fluent-plugin-systemd -v 0.0.5
+    gem install fluent-plugin-systemd -v 0.0.6
 
     or
 
-    td-agent-gem install fluent-plugin-systemd -v 0.0.5
+    td-agent-gem install fluent-plugin-systemd -v 0.0.6
 
 ## Configuration
 
     <source>
-      type systemd
+      @type systemd
       path /var/log/journal
       filters [{ "_SYSTEMD_UNIT": "kube-proxy.service" }]
       pos_file kube-proxy.pos

data/fluent-plugin-systemd.gemspec

@@ -5,13 +5,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-systemd"
-  spec.version       = "0.0.5"
+  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/assemblyline/fluent-plugin-systemd"
+  spec.homepage      = "https://github.com/reevoo/fluent-plugin-systemd"
   spec.license       = "MIT"
 
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.4"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit", "~> 2.5"
   spec.add_development_dependency "reevoocop"
 

data/lib/fluent/plugin/in_systemd.rb

@@ -13,21 +13,18 @@ module Fluent
     config_param :strip_underscores, :bool, default: false
     config_param :tag, :string
 
-    attr_reader :tag
-
     def configure(conf)
       super
-      @pos_writer = PosWriter.new(conf["pos_file"])
-      @journal = Systemd::Journal.new(path: path)
-      @read_from_head = conf["read_from_head"]
-      journal.filter(*filters)
+      @pos_writer = PosWriter.new(@pos_file)
+      @journal = Systemd::Journal.new(path: @path)
+      @journal.filter(*@filters)
       seek
     end
 
     def start
       super
       @running = true
-      pos_writer.start
+      @pos_writer.start
       @thread = Thread.new(&method(:run))
     end
 
@@ -35,29 +32,37 @@ module Fluent
       super
       @running = false
       @thread.join
-      pos_writer.shutdown
+      @pos_writer.shutdown
     end
 
     private
 
-    attr_reader :journal, :running, :lock, :cursor, :path, :pos_writer, :strip_underscores, :read_from_head
-
     def seek
-      journal.seek(@pos_writer.cursor || read_from)
+      seek_to(@pos_writer.cursor || read_from)
     rescue Systemd::JournalError
       log.warn("Could not seek to cursor #{@pos_writer.cursor} found in pos file: #{@pos_writer.path}")
-      journal.seek(read_from)
+      seek_to(read_from)
+    end
+
+    # according to https://github.com/ledbettj/systemd-journal/issues/64#issuecomment-271056644
+    # and https://bugs.freedesktop.org/show_bug.cgi?id=64614, after doing a seek(:tail),
+    # you must move back in such a way that the next move_next will return the last
+    # record
+    def seek_to(pos)
+      @journal.seek(pos)
+      return unless pos == :tail
+      @journal.move(-2)
     end
 
     def read_from
-      read_from_head ? :head : :tail
+      @read_from_head ? :head : :tail
     end
 
     def run
       Thread.current.abort_on_exception = true
       watch do |entry|
         begin
-          router.emit(tag, entry.realtime_timestamp.to_i, formatted(entry))
+          router.emit(@tag, entry.realtime_timestamp.to_i, formatted(entry))
         rescue => e
           log.error("Exception emitting record: #{e}")
         end
@@ -65,16 +70,16 @@ module Fluent
     end
 
     def formatted(entry)
-      return entry.to_h unless strip_underscores
+      return entry.to_h unless @strip_underscores
       Hash[entry.to_h.map { |k, v| [k.gsub(/\A_+/, ""), v] }]
     end
 
     def watch
-      while running
-        next unless journal.wait(1_000_000)
-        while journal.move_next && running
-          yield journal.current_entry
-          pos_writer.update(journal.cursor)
+      while @running
+        next unless @journal.wait(1_000_000)
+        while @journal.move_next && @running
+          yield @journal.current_entry
+          @pos_writer.update(@journal.cursor)
         end
       end
     end

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

@@ -5,53 +5,53 @@ module Fluent
     class PosWriter
       def initialize(pos_file)
         @path = pos_file
+        @lock = Mutex.new
+        @cursor = nil
+        @written_cursor = nil
         setup
       end
 
       attr_reader :cursor, :path
 
       def start
-        return unless path
+        return unless @path
         @running = true
         @thread = Thread.new(&method(:work))
       end
 
       def shutdown
-        return unless path
+        return unless @path
         @running = false
-        thread.join
+        @thread.join
         write_pos
       end
 
       def update(c)
-        return unless path
-        lock.synchronize { @cursor = c }
+        return unless @path
+        @lock.synchronize { @cursor = c }
       end
 
       private
 
-      attr_reader :lock, :thread, :running
-
       def setup
-        return unless path
-        @lock = Mutex.new
-        @cursor = IO.read(path).chomp if File.exist?(path)
+        return unless @path && File.exist?(@path)
+        @cursor = IO.read(@path).chomp
       end
 
       def work
-        while running
+        while @running
           write_pos
           sleep 1
         end
       end
 
       def write_pos
-        lock.synchronize do
-          if @written_cursor != cursor
-            file = File.open(path, "w+")
-            file.print cursor
+        @lock.synchronize do
+          if @written_cursor != @cursor
+            file = File.open(@path, "w+")
+            file.print @cursor
             file.close
-            @written_cursor = cursor
+            @written_cursor = @cursor
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-systemd
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,9 @@ files:
 - lib/fluent/plugin/systemd/pos_writer.rb
 - pkg/fluent-plugin-systemd-0.0.3.gem
 - pkg/fluent-plugin-systemd-0.0.4.gem
-homepage: https://github.com/assemblyline/fluent-plugin-systemd
+- 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
 metadata: {}