fluent-plugin-systemd 0.1.1.pre3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a98a79b5d7bfa6dde174c9c0d8352407b07d37d
-  data.tar.gz: f6ddce5e5522d96460b4794fe1646bcc6f7837a2
+  metadata.gz: 3d1e4a2ade25b42fdf5d04e16ce877c6c380953f
+  data.tar.gz: 1dacc441622a3dfae2985a6be2f41f26efcc7341
 SHA512:
-  metadata.gz: 378a0319305a350c770213d8090550bd808f664bef08766bb2bc0c03bcb69e3aad0244d5246f99feba606ae0159dcb32f579f43a673d5dc435cdcf77f199462f
-  data.tar.gz: 296c1f33d19d5c4adcd68354330bb1f8ca9c13e0d16b128c1828a8d252f2aea3b2f1300689a83d607212a527d0681579f5ba052e0b43b63aa010e844bfdaa125
+  metadata.gz: 186f98b177cde9d3537bb4e0b06e337cc94c149e679aa044b173accb56ea76b0125fd6bbc154894ca01bfb75b7f34b579e98d7cb49a2f3fc7ea70a379e6503da
+  data.tar.gz: a7e29f074c8c01afd459cb33c4f048b63317fcfc2cba4d5146c684a4cd9b36363363ea7b3585d12654f6e85efab1a97f746ace81abf91baa8a2210ce52ca3a28

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-systemd (0.1.1.pre3)
+    fluent-plugin-systemd (0.1.1)
       fluentd (>= 0.14.11, < 2)
       systemd-journal (~> 1.2)
 

data/README.md

@@ -5,13 +5,13 @@
 # Requirements <a name="requirements"></a>
 
 
-|fluent-plugin-systemd|fluentd|ruby|
+|fluent-plugin-systemd|fluentd|td-agent|ruby|
 |----|----|----|
-| 0.1.x | >= 0.14.11, < 2 | >= 2.1 |
-| 0.0.x | ~> 0.12.0 | >= 1.9  |
+| 0.1.x | >= 0.14.11, < 2 | 3 | >= 2.1 |
+| 0.0.x | ~> 0.12.0       | 2 | >= 1.9  |
 
 * The 0.1.x series is developed from this branch (master)
-* The 0.0.x series (compatible with fluentd v0.12) is developed on the [0.0.x branch](https://github.com/reevoo/fluent-plugin-systemd/tree/0.0.x)
+* The 0.0.x series (compatible with fluentd v0.12, and td-agent 2) is developed on the [0.0.x branch](https://github.com/reevoo/fluent-plugin-systemd/tree/0.0.x)
 
 ## Overview
 
@@ -21,11 +21,11 @@
 
 Simply use RubyGems:
 
-    gem install fluent-plugin-systemd -v 0.1.0
+    gem install fluent-plugin-systemd -v 0.1.1
 
     or
 
-    td-agent-gem install fluent-plugin-systemd -v 0.6.0
+    td-agent-gem install fluent-plugin-systemd -v 0.1.1
 
 ## 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.1.1.pre3"
+  spec.version       = "0.1.1"
   spec.authors       = ["Ed Robinson"]
   spec.email         = ["ed@reevoo.com"]
 

data/lib/fluent/plugin/in_systemd.rb

@@ -19,7 +19,7 @@ module Fluent
       def configure(conf)
         super
         @pos_writer = PosWriter.new(@pos_file)
-        init_journal
+        @journal    = nil
       end
 
       def start
@@ -42,12 +42,19 @@ module Fluent
         @journal.wait(0)
         @journal.filter(*@filters)
         seek
+        true
+      rescue Systemd::JournalError => e
+        log.warn("#{e.class}: #{e.message} retrying in 1s")
+        false
       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}")
+        log.warn(
+          "Could not seek to cursor #{@pos_writer.cursor} found in pos file: #{@pos_writer.path}, " \
+          "falling back to reading from #{read_from}",
+        )
         seek_to(read_from)
       end
 
@@ -70,6 +77,7 @@ module Fluent
       end
 
       def run
+        return unless @journal || init_journal
         init_journal if @journal.wait(0) == :invalidate
         watch do |entry|
           begin

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

@@ -28,7 +28,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.1.1.pre3
+  version: 0.1.1
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - LICENCE
 - README.md
 - Rakefile
+- Vagrantfile
 - fluent-plugin-systemd.gemspec
 - lib/fluent/plugin/in_systemd.rb
 - lib/fluent/plugin/systemd/pos_writer.rb
@@ -122,6 +123,7 @@ files:
 - pkg/fluent-plugin-systemd-0.1.0.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
@@ -137,9 +139,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.9