Merge pull request #67 from reevoo/fd-fixess

Require version of systemd-journal with fd fix
fluent-plugins-nursery · Jun 12, 2018 · c99be99 · c99be99
2 parents 48c8066 + a2116a4
commit c99be99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/fluent-plugin-systemd.gemspec b/fluent-plugin-systemd.gemspec
@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.53.0'
 
   spec.add_runtime_dependency 'fluentd', ['>= 0.14.11', '< 2']
-  spec.add_runtime_dependency 'systemd-journal', '~> 1.3'
+  spec.add_runtime_dependency 'systemd-journal', '~> 1.3.2'
 end
diff --git a/lib/fluent/plugin/in_systemd.rb b/lib/fluent/plugin/in_systemd.rb
@@ -66,9 +66,6 @@ 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
-        @journal.wait(0)
         @journal.filter(*(@matches || @filters))
         seek
         true