fluent-plugin-systemd 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b743a85ec91f64910f7c323a6ac9c3ba2f3dc8be
-  data.tar.gz: df1ca5c2c12b2d46e7d97fc03dc7c8c6fedf388e
+  metadata.gz: 52a7137bc995eb3728a32688a3ee7d6ca1dc525a
+  data.tar.gz: f4341fe249300532ba5e13eb399261c522ebaeb2
 SHA512:
-  metadata.gz: 8c9e624bc2f7ee2d996b28180d7fd9dbf46748b9f3d45dc65b6ad90bbedf57da2b44a72e25db87782f1f02dd00f8f1af14eb1b5a30205cf953ec0e0e8a8ea8e0
-  data.tar.gz: 624889ccba1c2176c71fd763699cc57470136820f4afa2a8241a61a7fe7586cfebe3d499bf7a65dd531fbfa0d1680b3041802a56c5e501f64087f39ba95a4eae
+  metadata.gz: 56296694577ea11491800068cc437089d3846bb30dc60cd9031671e08ca5a8d0a983e9aec42a00db36659b98d68a227d123d97250b79d33b8b75162fc2661343
+  data.tar.gz: b5fbccaef86385247778712ed68c319eff8f1f648ac4879dd41f59eba3d4fa4d718bc1e46dea9bef5e923d0a634319a89f52e30c200a44fe9138f799d79bc433

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-systemd (0.0.6)
+    fluent-plugin-systemd (0.0.7)
       fluentd (~> 0.12)
       systemd-journal (~> 1.2)
 

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/Vagrantfile

@@ -0,0 +1,71 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "centos/7"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+end

data/fluent-plugin-systemd.gemspec

@@ -5,7 +5,7 @@ $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.version       = "0.0.7"
   spec.authors       = ["Ed Robinson"]
   spec.email         = ["ed@reevoo.com"]
 

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,16 @@ module Fluent
 
     private
 
+    def init_journal
+      sleep 0.25
+      @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 +66,7 @@ module Fluent
     end
 
     def run
+      init_journal
       Thread.current.abort_on_exception = true
       watch do |entry|
         begin
@@ -76,7 +84,7 @@ 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)

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.7
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,13 +106,19 @@ files:
 - LICENCE
 - README.md
 - Rakefile
+- Vagrantfile
 - 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.0.6.gem
 - pkg/fluent-plugin-systemd-0.1.0.gem
+- pkg/fluent-plugin-systemd-0.1.1.gem
+- pkg/fluent-plugin-systemd-0.1.1.pre.gem
+- pkg/fluent-plugin-systemd-0.1.1.pre2.gem
+- pkg/fluent-plugin-systemd-0.1.1.pre3.gem
 homepage: https://github.com/reevoo/fluent-plugin-systemd
 licenses:
 - MIT
@@ -133,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Input plugin to read from systemd journal.