fluent-plugin-systemd 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 57f4a5c49f8863f8264615a1b0893fac23c32f7feb82c815934ff263eb235ba4
-  data.tar.gz: 7613556c53faca8c867fde10119ab1e4207af816b7111cf8cea14b28a5c426ee
+SHA1:
+  metadata.gz: 027149ee076af73b625bdf8dcd22dd25a7f0e833
+  data.tar.gz: b729df398f867f111fd1a3f188eb7298437195c4
 SHA512:
-  metadata.gz: 49a2c2640a078b63a6addf9ca165003e33cde97e46b1485c1eb638efa6a2d8d63083096f63583ffe4c334402267ea5ea69f8dbed58697b7999d85ac9f71a1f69
-  data.tar.gz: d86b77ebfa1cad517c5e607bf831a40f947da5bc4a62e94ee26c04a13a5b1d47ccb3194eeb5d7c5ee7172232e6ebfb6cbcd1fdde4b7b08044243d4a5b8a71bb9
+  metadata.gz: 979f117f454ba7a4d72ce0c62fa82fa5cae5c18be170443a4d77160c2b6f58b2f2c7de8032d6abda96b4070ef83bdb6bf94bd6746277b56984550af1157821ff
+  data.tar.gz: 8cbcef9a6b30dee72ee515140ede68aa7317d3c9b8d338bdb76c84897d5eae0030ba810f4b840e8d902b8aab9573d58cb81314d2e5eb5b2d71eff9b4da894a60

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,67 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-systemd (0.1.0)
+      fluentd (>= 0.14.11, < 2)
+      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.14)
+    fluentd (0.14.11)
+      cool.io (~> 1.4.5)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 0.7.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (~> 0.1.7)
+      tzinfo (~> 1.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    http_parser.rb (0.6.0)
+    msgpack (1.0.2)
+    parser (2.3.3.1)
+      ast (~> 2.2)
+    powerpack (0.0.9)
+    rainbow (2.2.1)
+    rake (10.5.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)
+    serverengine (2.0.4)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.1.9)
+    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!
+  rake
+  reevoocop
+  test-unit (~> 2.5)
+
+BUNDLED WITH
+   1.13.2

data/README.md

@@ -2,22 +2,6 @@
 
 [![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
@@ -26,11 +10,15 @@ if you are using fluentd v0.14 for the latest and greatest features
 
 Simply use RubyGems:
 
-    gem install fluent-plugin-systemd -v 0.0.11
+    gem install fluent-plugin-systemd -v 0.1.0
 
     or
 
-    td-agent-gem install fluent-plugin-systemd -v 0.0.11
+    fluent-gem install fluent-plugin-systemd -v 0.1.0
+
+    or
+
+    td-agent-gem install fluent-plugin-systemd -v 0.1.0
 
 ## Configuration
 
@@ -90,9 +78,17 @@ For systems with systemd installed you can run the tests against your installed
 
 Issues and pull requests welcome
 
+## Maintainer
+
+* [Ed Robinson](https://github.com/errm)
+
 ## Contributors
 
-Many thanks to our brilliant contributors
+Many thanks to our fantastic contributors
 
-* [jescarri](https://github.com/jescarri)
-* [mikekap](https://github.com/mikekap)
+* [Jesus Rafael Carrillo](https://github.com/jescarri)
+* [Mike Kaplinskiy](https://github.com/mikekap)
+* [Sadayuki Furuhashi](https://github.com/frsyuki)
+* [Richard Megginson](https://github.com/richm)
+* [Masahiro Nakagawa](https://github.com/repeatedly)
+* [Hiroshi Hatake](https://github.com/cosmo0920)

data/Rakefile

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,28 @@
+# -*- 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.1.0"
+  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.14.11", "< 2"]
+  spec.add_runtime_dependency "systemd-journal", "~> 1.2"
+end

data/lib/fluent/plugin/in_systemd.rb

@@ -1,98 +1,84 @@
 require "systemd/journal"
-require "fluent/input"
+require "fluent/plugin/input"
 require "fluent/plugin/systemd/pos_writer"
 
 module Fluent
-  class SystemdInput < Input
-    Fluent::Plugin.register_input("systemd", self)
+  module Plugin
+    class SystemdInput < Input
+      Fluent::Plugin.register_input("systemd", self)
 
-    config_param :path, :string, default: "/var/log/journal"
-    config_param :filters, :array, default: []
-    config_param :pos_file, :string, default: nil
-    config_param :read_from_head, :bool, default: false
-    config_param :strip_underscores, :bool, default: false
-    config_param :tag, :string
+      helpers :timer
 
-    def configure(conf)
-      super
-      @pos_writer = PosWriter.new(@pos_file)
-    end
+      config_param :path, :string, default: "/var/log/journal"
+      config_param :filters, :array, default: []
+      config_param :pos_file, :string, default: nil
+      config_param :read_from_head, :bool, default: false
+      config_param :strip_underscores, :bool, default: false
+      config_param :tag, :string
 
-    def start
-      super
-      @running = true
-      @pos_writer.start
-      @thread = Thread.new(&method(:run))
-    end
+      def configure(conf)
+        super
+        @pos_writer = PosWriter.new(@pos_file)
+        @journal = Systemd::Journal.new(path: @path)
+        @journal.filter(*@filters)
+        seek
+      end
 
-    def shutdown
-      super
-      @running = false
-      @thread.join
-      @pos_writer.shutdown
-    end
+      def start
+        super
+        @pos_writer.start
+        timer_execute(:in_systemd_emit_worker, 1, &method(:run))
+      end
 
-    private
+      def shutdown
+        @pos_writer.shutdown
+        super
+      end
 
-    def init_journal
-      @journal.close if @journal
-      @journal = Systemd::Journal.new(path: @path)
-      @journal.filter(*@filters)
-      seek
-    end
+      private
 
-    def seek
-      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}")
-      seek_to(read_from)
-    end
+      def seek
+        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}")
+        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
+      # 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
-    end
+      def read_from
+        @read_from_head ? :head : :tail
+      end
 
-    def run
-      init_journal
-      Thread.current.abort_on_exception = true
-      watch do |entry|
-        begin
-          router.emit(@tag, entry.realtime_timestamp.to_i, formatted(entry))
-        rescue => e # rubocop:disable Style/RescueStandardError
-          log.error("Exception emitting record: #{e}")
+      def run
+        Thread.current.abort_on_exception = true
+        watch do |entry|
+          begin
+            router.emit(@tag, Fluent::EventTime.from_time(entry.realtime_timestamp), formatted(entry))
+          rescue => e
+            log.error("Exception emitting record: #{e}")
+          end
         end
       end
-    end
 
-    def formatted(entry)
-      return entry.to_h unless @strip_underscores
-      Hash[entry.to_h.map { |k, v| [k.gsub(/\A_+/, ""), v] }]
-    end
+      def formatted(entry)
+        return entry.to_h unless @strip_underscores
+        Hash[entry.to_h.map { |k, v| [k.gsub(/\A_+/, ""), v] }]
+      end
 
-    def watch
-      while @running
-        init_journal if @journal.wait(0) == :invalidate
-        while @journal.move_next && @running
-          begin
-            yield @journal.current_entry
-          rescue Systemd::JournalError => e
-            log.warn("Error Parsing Journal: #{e.class}: #{e.message}")
-            next
-          end
+      def watch
+        while @journal.move_next
+          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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-systemd
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,61 +39,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: reevoocop
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: reevoocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.11
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.11
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: systemd-journal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.2'
 description: This is a fluentd input plugin. It reads logs from the systemd journal.
 email:
 - ed@reevoo.com
@@ -101,10 +107,17 @@ 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
 homepage: https://github.com/reevoo/fluent-plugin-systemd
 licenses:
 - MIT
@@ -125,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Input plugin to read from systemd journal.