fluent-plugin-systemd 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14abb1b9c6b985bbaee61aae73791108578c738e
-  data.tar.gz: ab54b3167ad1832efd73d15eff17d0b4ed2d6e0a
+  metadata.gz: c2cebb67ce9b89e20f0354bdbb45f7f3c8f1c817
+  data.tar.gz: b59f85ccd7e8550cdf7835c2fa3449406e9c0769
 SHA512:
-  metadata.gz: 26dca0c3b93b49899fbb903ccfc66f79d9f2ded5416ce1bdd28b920b83583a4de29c812a426aabe9aad4b5718055b532f2fcaa6c2b15d77e4ea8bcb46fcebe23
-  data.tar.gz: a715f762f61481b93c1179af10c30f978cbafad7c01ffdd136a79e6d21757d5ce449f59640887d875fc74327c1c1c51d2d09a08eee1a0f1760054ecfc111c9e7
+  metadata.gz: 8a115c1eb388b1263f933d1f3283c84b6dbbfc4093756842095879c7f07312c0562ccbf87093fb4defd643e17cc5219569c795a48e82f3e79200990d8b22360f
+  data.tar.gz: ba30dc865abe28b552379c7a680f6ffff3303990d98eea0747d4bda5810a585cbb866c9410a57302e6f4e9e5385d33894c0dacaca192fec4c207f5dc2e17917c

data/README.md

@@ -28,11 +28,11 @@ Join the #plugin-systemd channel on the [Fluentd Slack](http://slack.fluentd.org
 
 Simply use RubyGems:
 
-    gem install fluent-plugin-systemd -v 0.3.0
+    gem install fluent-plugin-systemd -v 0.3.1
 
 or
 
-    td-agent-gem install fluent-plugin-systemd -v 0.3.0
+    td-agent-gem install fluent-plugin-systemd -v 0.3.1
 
 ## Input Plugin Configuration
 
@@ -167,6 +167,17 @@ The resulting entry using the above sample configuration:
 }
 ```
 
+## Common Issues
+
+> ### When I look at fluentd logs, everything looks fine but no journal logs are read
+
+This is commonly caused when the user running fluentd does not have enough permisions
+to read the systemd journal.
+
+Acording to the [systemd documentation](https://www.freedesktop.org/software/systemd/man/systemd-journald.service.html):
+> Journal files are, by default, owned and readable by the "systemd-journal" system group but are not writable. Adding a user to this group thus enables her/him to read the journal files.
+
+
 ## Dependencies
 
 This plugin depends on libsystemd
@@ -177,11 +188,17 @@ To run the tests with docker on several distros simply run `rake`
 
 For systems with systemd installed you can run the tests against your installed libsystemd with `rake test`
 
-## Licence etc
+## Licence
 
 [MIT](LICENCE)
 
-Issues and pull requests welcome
+## Contributions
+
+Issues and pull requests are very welcome.
+
+If you want to make a contribution but need some help or advice feel free to message me @errm on the [Fluentd Slack](http://slack.fluentd.org/), or send me an email ed@reevoo.com.
+
+We have adopted the [Contributor Covenant](CODE_OF_CONDUCT.md) and thus expect anyone interacting with contributors, maintainers and users of this project to abide by it.
 
 ## Maintainer
 
@@ -191,10 +208,11 @@ Issues and pull requests welcome
 
 Many thanks to our fantastic contributors
 
-* [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)
+* [Erik Maciejewski](https://github.com/emacski)
+* [Masahiro Nakagawa](https://github.com/repeatedly)
+* [Richard Megginson](https://github.com/richm)
+* [Mike Kaplinskiy](https://github.com/mikekap)
 * [neko-neko](https://github.com/neko-neko)
+* [Sadayuki Furuhashi](https://github.com/frsyuki)
+* [Jesus Rafael Carrillo](https://github.com/jescarri)

data/lib/fluent/plugin/in_systemd.rb

@@ -6,7 +6,7 @@ require "fluent/plugin/systemd/entry_mutator"
 
 module Fluent
   module Plugin
-    class SystemdInput < Input
+    class SystemdInput < Input # rubocop:disable Metrics/ClassLength
       Fluent::Plugin.register_input("systemd", self)
 
       helpers :timer, :storage
@@ -61,6 +61,8 @@ module Fluent
       private
 
       def init_journal
+        # TODO: ruby 2.3
+        @journal.close if @journal # rubocop:disable Style/SafeNavigation
         @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
@@ -128,7 +130,12 @@ module Fluent
 
       def watch
         while @journal.move_next
-          yield @journal.current_entry
+          begin
+            yield @journal.current_entry
+          rescue Systemd::JournalError => e
+            log.warn("Error Parsing Journal: #{e.class}: #{e.message}")
+            next
+          end
           @pos_storage.put(:journal, @journal.cursor)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-systemd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 description: This is a fluentd input plugin. It reads logs from the systemd journal.
 email:
 - ed@reevoo.com