systemd-journal 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c615cee8de41012105d99aec5b93f8c88f322b67bbf4d97bcb4afbd74cec35
-  data.tar.gz: 84447c503addd9fc6c3c6564472e7eb1558f6e6a184a98214c604feb2649ecea
+  metadata.gz: f33c8fad86b5eee9fa452aefe9b33984383cea940b21075c6394c1a1d4ce85ef
+  data.tar.gz: fb07b5691db94be4abb21e7b2ca9a9541be0863e11e3899dcd55c16e52661a43
 SHA512:
-  metadata.gz: dd1375594a013f9d237c0a62f5c4aed77f80b54637e1275cf32565905fde72187eb08feefc4d93129a3a942949de93d2f037b0af2893e95f52c006d682e32b39
-  data.tar.gz: 9debfc4954cc65ddf9fda2d448c30b67c0995cf2ad554dcfb00b067103218a5898d8d9f619e6b04236d184742397d64b5365efbbd90cb0be6f26a25cbeb8887b
+  metadata.gz: 2345a7cb623c6998f2f2aee2136e55b6c79278fd9fe5b223f548cbcf3f0b176cbe58e019f19a9a0ee547015a3f0f3b969509eb488f1feb86464412f357f821ea
+  data.tar.gz: '09323d66962413d09ebb444d0667d1d3d35cb4208ea388910233bb2a28368de63b97f2cd1a8d046bc205c872cb2f348f4a8fa4bcc41b715012cc7c149937af4a'

data/.github/workflows/ruby.yml

@@ -1,20 +1,32 @@
 name: RSpec Matrix
-on: [push]
+on: [push, pull_request]
+
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu]
-        ruby: [3.0, 3.1, 3.2, 3.3]
-    runs-on: ${{ matrix.os }}-latest
+        os: [ubuntu-latest]
+        ruby: [3.1, 3.2, 3.3, 3.4]
+    runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - run: sudo apt-get install libjemalloc2 --yes
-    - run: bundle install
     - run: bundle exec rake compile
     - run: bundle exec rake spec
     - run: LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2 bundle exec rake spec
+  lint:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.4
+        bundler-cache: true
+    - run: bundle exec rake standard

data/Gemfile

@@ -1,8 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in systemd-journal.gemspec
 gemspec
 
 group :test do
-  gem 'codeclimate-test-reporter', require: nil
+  gem "codeclimate-test-reporter", require: nil
 end

data/README.md

@@ -80,6 +80,16 @@ j.current_entry # get the entry we're currently positioned at
 j.seek(Time.parse('2013-10-31T12:00:00+04:00:00'))
 ```
 
+Re-open the journal automatically to reduce memory usage with moving the journal:
+
+```ruby
+Journal.new(auto_reopen: false) # do not ever re-open the journal.
+                                # this should be the default for now
+
+Journal.new(auto_reopen: true)   # re-open the journal after the default ITERATIONS_TO_AUTO_REOPEN
+Journal.new(auto_reopen: 50_000) # re-open the journal after 50k iterations
+```
+
 Waiting for things to happen:
 
 ```ruby

data/Rakefile

@@ -1,29 +1,21 @@
-require 'bundler/gem_tasks'
-require 'yard'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "yard"
+require "rspec/core/rake_task"
 require "rake/extensiontask"
+require "standard/rake"
 
-unless ENV['RUBOCOP'] == 'false'
-  require 'rubocop/rake_task'
-
-  RuboCop::RakeTask.new(:rubocop) do |task|
-    task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
-    task.fail_on_error = false
-  end
-end
-
-desc 'open a console with systemd/journal required'
+desc "open a console with systemd/journal required"
 task :console do
-  exec 'pry -I./lib -r systemd/journal'
+  exec "pry -I./lib -r systemd/journal"
 end
 
 YARD::Rake::YardocTask.new do |t|
-  t.files = ['lib/**/*.rb']
-  t.options = ['--no-private', '--markup=markdown']
+  t.files = ["lib/**/*.rb"]
+  t.options = ["--no-private", "--markup=markdown"]
 end
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w(--color)
+  t.rspec_opts = %w[--color]
 end
 
 GEMSPEC = Gem::Specification.load("systemd-journal.gemspec")

data/examples/journal_directory.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'systemd/journal'
+require "systemd/journal"
 
 if ARGV.length == 0
   puts "usage: ./#{File.basename(__FILE__)} /var/log/journal/{machine-id}"

data/examples/ssh_watcher.rb

@@ -1,23 +1,23 @@
 #!/usr/bin/env ruby
-require 'systemd/journal'
-require 'date'
+require "systemd/journal"
+require "date"
 
 class SSHWatcher
+  LOGIN_REGEXP = /Accepted\s+(?<auth_method>[^\s]+)\s+for\s+(?<user>[^\s]+)\s+from\s+(?<address>[^\s]+)/
+
   def initialize
     @journal = Systemd::Journal.new(flags: Systemd::Journal::Flags::SYSTEM_ONLY)
   end
 
   def run
-    @journal.filter(_exe: '/usr/bin/sshd')
+    @journal.filter(_exe: "/usr/bin/sshd")
     @journal.seek(:tail)
     @journal.move_previous
-    @journal.watch{ |entry| process_event(entry) }
+    @journal.watch { |entry| process_event(entry) }
   end
 
   private
 
-  LOGIN_REGEXP = /Accepted\s+(?<auth_method>[^\s]+)\s+for\s+(?<user>[^\s]+)\s+from\s+(?<address>[^\s]+)/
-
   def process_event(entry)
     if (m = entry.message.match(LOGIN_REGEXP))
       timestamp = DateTime.strptime(

data/lib/systemd/ffi_size_t.rb

@@ -1,21 +1,21 @@
-require 'ffi'
+require "ffi"
 
 # @private
 class FFI::MemoryPointer
   # monkey patch a read_size_t and write_size_t method onto FFI::MemoryPointer.
   # see https://github.com/ffi/ffi/issues/118
   def self.monkey_patch_type_i_need!(which)
-    return if self.respond_to?("read_#{which}")
+    return if respond_to?(:"read_#{which}")
 
     type = FFI.find_type(which)
     type, _ = FFI::TypeDefs.find do |(name, t)|
-      method_defined?("read_#{name}") if t == type
+      method_defined?(:"read_#{name}") if t == type
     end
 
     raise "Unable to patch in reader/writer for #{which}" if type.nil?
 
-    alias_method "read_#{which}", "read_#{type}"
-    alias_method "write_#{which}", "write_#{type}"
+    alias_method :"read_#{which}", :"read_#{type}"
+    alias_method :"write_#{which}", :"write_#{type}"
   end
 end
 

data/lib/systemd/id128.rb

@@ -1,4 +1,4 @@
-require 'ffi'
+require "ffi"
 
 module Systemd
   # Provides access to the 128-bit IDs for various items in the systemd
@@ -32,9 +32,7 @@ module Systemd
       read_id128(:sd_id128_randomize)
     end
 
-    private
-
-    def self.read_id128(func)
+    private_class_method def self.read_id128(func)
       ptr = FFI::MemoryPointer.new(Native::Id128, 1)
       rc = Native.send(func, ptr)
       raise JournalError, rc if rc < 0
@@ -43,28 +41,28 @@ module Systemd
 
     # providing bindings to the systemd-id128 library.
     module Native
-      require 'ffi'
+      require "ffi"
       extend FFI::Library
-      ffi_lib %w( libsystemd.so.0       libsystemd.so
-                  libsystemd-id128.so.0 libsystemd-id128.so )
+      ffi_lib %w[ libsystemd.so.0 libsystemd.so
+        libsystemd-id128.so.0 libsystemd-id128.so ]
 
       attach_function :sd_id128_get_machine, [:pointer], :int
-      attach_function :sd_id128_get_boot,    [:pointer], :int
-      attach_function :sd_id128_randomize,   [:pointer], :int
+      attach_function :sd_id128_get_boot, [:pointer], :int
+      attach_function :sd_id128_randomize, [:pointer], :int
 
       # @private
       class Id128 < FFI::Union
-        layout :bytes,  [:uint8, 16],
-               :dwords, [:uint32, 4],
-               :qwords, [:uint64, 2]
+        layout :bytes, [:uint8, 16],
+          :dwords, [:uint32, 4],
+          :qwords, [:uint64, 2]
 
         def to_s
-          format('%02x' * 16, *self[:bytes].to_a)
+          format("%02x" * 16, *self[:bytes].to_a)
         end
 
         def self.from_s(str)
           r = Id128.new
-          [str].pack('H*').bytes.each_with_index do |b, i|
+          [str].pack("H*").bytes.each_with_index do |b, i|
             r[:bytes][i] = b
           end
 

data/lib/systemd/journal/fields.rb

@@ -1,18 +1,18 @@
 module Systemd
   class Journal
     # Fields directly passed by client programs and stored in the journal.
-    USER_FIELDS = %w( MESSAGE MESSAGE_ID PRIORITY CODE_FILE CODE_LINE CODE_FUNC
-                      ERRNO SYSLOG_FACILITY SYSLOG_IDENTIFIER SYSLOG_PID )
+    USER_FIELDS = %w[ MESSAGE MESSAGE_ID PRIORITY CODE_FILE CODE_LINE CODE_FUNC
+      ERRNO SYSLOG_FACILITY SYSLOG_IDENTIFIER SYSLOG_PID ]
 
     # Fields generated by the journal and added to each event.
-    TRUSTED_FIELDS = %w( _PID _UID _GID _COMM _EXE _CMDLINE _AUDIT_SESSION
-                         _AUDIT_LOGINUID _SYSTEMD_CGROUP _SYSTEMD_SESSION
-                         _SYSTEMD_UNIT _SYSTEMD_USER_UNIT _SYSTEMD_OWNER_UID
-                         _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP _BOOT_ID
-                         _MACHINE_ID _HOSTNAME _TRANSPORT )
+    TRUSTED_FIELDS = %w[ _PID _UID _GID _COMM _EXE _CMDLINE _AUDIT_SESSION
+      _AUDIT_LOGINUID _SYSTEMD_CGROUP _SYSTEMD_SESSION
+      _SYSTEMD_UNIT _SYSTEMD_USER_UNIT _SYSTEMD_OWNER_UID
+      _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP _BOOT_ID
+      _MACHINE_ID _HOSTNAME _TRANSPORT ]
 
     # Fields used in messages originating from the kernel.
-    KERNEL_FIELDS = %w( _KERNEL_DEVICE _KERNEL_SUBSYSTEM _UDEV_SYSNAME
-                        _UDEV_DEVNODE _UDEV_DEVLINK )
+    KERNEL_FIELDS = %w[ _KERNEL_DEVICE _KERNEL_SUBSYSTEM _UDEV_SYSNAME
+      _UDEV_DEVNODE _UDEV_DEVLINK ]
   end
 end

data/lib/systemd/journal/filterable.rb

@@ -36,6 +36,8 @@ module Systemd
       # @param [String] value the match to search for, e.g. '/usr/bin/sshd'
       # @return [nil]
       def add_filter(field, value)
+        @reopen_filter_conditions << {field => value}
+
         match = "#{field.to_s.upcase}=#{value}"
         rc = Native.sd_journal_add_match(@ptr, match, match.length)
         raise JournalError, rc if rc < 0
@@ -70,6 +72,8 @@ module Systemd
       #     # has priority 5
       #   end
       def add_disjunction
+        @reopen_filter_conditions << :disjunction
+
         rc = Native.sd_journal_add_disjunction(@ptr)
         raise JournalError, rc if rc < 0
       end
@@ -88,6 +92,8 @@ module Systemd
       #     # current_entry is an sshd event with priority 5
       #   end
       def add_conjunction
+        @reopen_filter_conditions << :conjunction
+
         rc = Native.sd_journal_add_conjunction(@ptr)
         raise JournalError, rc if rc < 0
       end
@@ -95,8 +101,31 @@ module Systemd
       # Remove all filters and conjunctions/disjunctions.
       # @return [nil]
       def clear_filters
+        @reopen_filter_conditions = []
+
         Native.sd_journal_flush_matches(@ptr)
       end
+
+      private
+
+      # Restore filters from a previously saved set of conditions.
+      # Note that this cannot be a reference to the existing @reopen_filter_conditions
+      # as they will be cleared when this method is called.
+      # # @param [Array] conditions an array of conditions to restore.
+      def restore_filters(conditions)
+        clear_filters
+
+        conditions.each do |condition|
+          case condition
+          when :disjunction
+            add_disjunction
+          when :conjunction
+            add_conjunction
+          else
+            add_filters(condition)
+          end
+        end
+      end
     end
   end
 end

data/lib/systemd/journal/flags.rb

@@ -6,11 +6,11 @@ module Systemd
     #   Systemd::Journal.new(flags: Systemd::Journal::Flags::LOCAL_ONLY)
     module Flags
       # Only open journal files generated on the local machine.
-      LOCAL_ONLY    = 1
+      LOCAL_ONLY = 1
       # Only open non-persistent journal files.
-      RUNTIME_ONLY  = 2
+      RUNTIME_ONLY = 2
       # Only open kernel and system service journal files.
-      SYSTEM_ONLY   = 4
+      SYSTEM_ONLY = 4
     end
   end
 end

data/lib/systemd/journal/native.rb

@@ -1,15 +1,15 @@
-require 'systemd/id128'
+require "systemd/id128"
 
 module Systemd
   class Journal
     # Provides the FFI bindings to the native `libsystemd-journal` shared
     # library.
     module Native
-      # rubocop:disable LineLength
-      require 'ffi'
+      # rubocop:disable Layout/LineLength
+      require "ffi"
       extend FFI::Library
-      ffi_lib %w( libsystemd.so.0         libsystemd.so
-                  libsystemd-journal.so.0 libsystemd-journal.so)
+      ffi_lib %w[ libsystemd.so.0 libsystemd.so
+        libsystemd-journal.so.0 libsystemd-journal.so]
 
       @has_open_container = true
 
@@ -18,11 +18,11 @@ module Systemd
       end
 
       # setup/teardown
-      attach_function :sd_journal_open,           [:pointer, :int], :int
+      attach_function :sd_journal_open, [:pointer, :int], :int
       attach_function :sd_journal_open_directory, [:pointer, :string, :int], :int
-      attach_function :sd_journal_close,          [:pointer], :void
+      attach_function :sd_journal_close, [:pointer], :void
 
-      attach_function :sd_journal_open_files,     [:pointer, :pointer, :int], :int
+      attach_function :sd_journal_open_files, [:pointer, :pointer, :int], :int
 
       # not available in 208
       begin
@@ -32,53 +32,53 @@ module Systemd
       end
 
       # navigation
-      attach_function :sd_journal_next,          [:pointer], :int
-      attach_function :sd_journal_next_skip,     [:pointer, :uint64], :int
-      attach_function :sd_journal_previous,      [:pointer], :int
+      attach_function :sd_journal_next, [:pointer], :int
+      attach_function :sd_journal_next_skip, [:pointer, :uint64], :int
+      attach_function :sd_journal_previous, [:pointer], :int
       attach_function :sd_journal_previous_skip, [:pointer, :uint64], :int
 
-      attach_function :sd_journal_seek_head,          [:pointer], :int
-      attach_function :sd_journal_seek_tail,          [:pointer], :int
+      attach_function :sd_journal_seek_head, [:pointer], :int
+      attach_function :sd_journal_seek_tail, [:pointer], :int
       attach_function :sd_journal_seek_realtime_usec, [:pointer, :uint64], :int
 
-      attach_function :sd_journal_get_cursor,  [:pointer, :pointer], :int
-      attach_function :sd_journal_seek_cursor, [:pointer, :string],  :int
-      attach_function :sd_journal_test_cursor, [:pointer, :string],  :int
+      attach_function :sd_journal_get_cursor, [:pointer, :pointer], :int
+      attach_function :sd_journal_seek_cursor, [:pointer, :string], :int
+      attach_function :sd_journal_test_cursor, [:pointer, :string], :int
 
       # data reading
-      attach_function :sd_journal_get_data,       [:pointer, :string, :pointer, :pointer], :int
-      attach_function :sd_journal_restart_data,   [:pointer], :void
+      attach_function :sd_journal_get_data, [:pointer, :string, :pointer, :pointer], :int
+      attach_function :sd_journal_restart_data, [:pointer], :void
       attach_function :sd_journal_enumerate_data, [:pointer, :pointer, :pointer], :int
-      attach_function :sd_journal_get_catalog,    [:pointer, :pointer], :int
+      attach_function :sd_journal_get_catalog, [:pointer, :pointer], :int
       attach_function :sd_journal_get_catalog_for_message_id, [Systemd::Id128::Native::Id128.by_value, :pointer], :int
 
-      attach_function :sd_journal_get_realtime_usec,  [:pointer, :pointer], :int
+      attach_function :sd_journal_get_realtime_usec, [:pointer, :pointer], :int
       attach_function :sd_journal_get_monotonic_usec, [:pointer, :pointer, :pointer], :int
 
       attach_function :sd_journal_get_data_threshold, [:pointer, :pointer], :int
-      attach_function :sd_journal_set_data_threshold, [:pointer, :size_t],  :int
+      attach_function :sd_journal_set_data_threshold, [:pointer, :size_t], :int
 
       # querying
-      attach_function :sd_journal_query_unique,     [:pointer, :string], :int
+      attach_function :sd_journal_query_unique, [:pointer, :string], :int
       attach_function :sd_journal_enumerate_unique, [:pointer, :pointer, :pointer], :int
-      attach_function :sd_journal_restart_unique,   [:pointer], :void
+      attach_function :sd_journal_restart_unique, [:pointer], :void
 
       # event notification
       enum :wake_reason, [:nop, :append, :invalidate]
-      attach_function :sd_journal_wait,        [:pointer, :uint64], :wake_reason, blocking: true
-      attach_function :sd_journal_get_fd,      [:pointer], :int
-      attach_function :sd_journal_process,     [:pointer], :wake_reason
+      attach_function :sd_journal_wait, [:pointer, :uint64], :wake_reason, blocking: true
+      attach_function :sd_journal_get_fd, [:pointer], :int
+      attach_function :sd_journal_process, [:pointer], :wake_reason
       attach_function :sd_journal_reliable_fd, [:pointer], :int
 
       # filtering
-      attach_function :sd_journal_add_match,       [:pointer, :string, :size_t], :int
-      attach_function :sd_journal_flush_matches,   [:pointer], :void
+      attach_function :sd_journal_add_match, [:pointer, :string, :size_t], :int
+      attach_function :sd_journal_flush_matches, [:pointer], :void
       attach_function :sd_journal_add_disjunction, [:pointer], :int
       attach_function :sd_journal_add_conjunction, [:pointer], :int
 
       # writing
-      attach_function :sd_journal_print,  [:int, :string], :int
-      attach_function :sd_journal_send,   [:varargs], :int
+      attach_function :sd_journal_print, [:int, :string], :int
+      attach_function :sd_journal_send, [:varargs], :int
       attach_function :sd_journal_perror, [:string], :int
       attach_function :sd_journal_stream_fd, [:string, :int, :bool], :int
 

data/lib/systemd/journal/navigable.rb

@@ -1,6 +1,9 @@
 module Systemd
   class Journal
     module Navigable
+      ITERATIONS_TO_AUTO_REOPEN = 10_000
+      private_constant :ITERATIONS_TO_AUTO_REOPEN
+
       # returns a string representing the current read position.
       # This string can be passed to {#seek} or {#cursor?}.
       # @return [String] a cursor token.
@@ -32,7 +35,7 @@ module Systemd
       #   it moves backwards.  Defaults to moving forward one entry.
       # @return [Integer] number of entries the read pointer actually moved.
       def move(offset = 1)
-        offset > 0 ? move_next_skip(offset) : move_previous_skip(-offset)
+        (offset > 0) ? move_next_skip(offset) : move_previous_skip(-offset)
       end
 
       # Move the read pointer to the next entry in the journal.
@@ -40,9 +43,11 @@ module Systemd
       # @return [Boolean] False if unable to move to the next entry, indicating
       #   that the pointer has reached the end of the journal.
       def move_next
-        rc = Native.sd_journal_next(@ptr)
-        raise JournalError, rc if rc < 0
-        rc > 0
+        with_auto_reopen {
+          rc = Native.sd_journal_next(@ptr)
+          raise JournalError, rc if rc < 0
+          rc > 0
+        }
       end
 
       # Move the read pointer forward by `amount` entries.
@@ -50,9 +55,11 @@ module Systemd
       #   moved. If this number is less than the requested amount, the read
       #   pointer has reached the end of the journal.
       def move_next_skip(amount)
-        rc = Native.sd_journal_next_skip(@ptr, amount)
-        raise JournalError, rc if rc < 0
-        rc
+        with_auto_reopen {
+          rc = Native.sd_journal_next_skip(@ptr, amount)
+          raise JournalError, rc if rc < 0
+          rc
+        }
       end
 
       # Move the read pointer to the previous entry in the journal.
@@ -60,9 +67,11 @@ module Systemd
       # @return [Boolean] False if unable to move to the previous entry,
       #   indicating that the pointer has reached the beginning of the journal.
       def move_previous
-        rc = Native.sd_journal_previous(@ptr)
-        raise JournalError, rc if rc < 0
-        rc > 0
+        with_auto_reopen {
+          rc = Native.sd_journal_previous(@ptr)
+          raise JournalError, rc if rc < 0
+          rc > 0
+        }
       end
 
       # Move the read pointer backwards by `amount` entries.
@@ -70,9 +79,11 @@ module Systemd
       #   was moved.  If this number is less than the requested amount, the
       #   read pointer has reached the beginning of the journal.
       def move_previous_skip(amount)
-        rc = Native.sd_journal_previous_skip(@ptr, amount)
-        raise JournalError, rc if rc < 0
-        rc
+        with_auto_reopen {
+          rc = Native.sd_journal_previous_skip(@ptr, amount)
+          raise JournalError, rc if rc < 0
+          rc
+        }
       end
 
       # Seek to a position in the journal.
@@ -90,31 +101,69 @@ module Systemd
       #   and seek to that entry.
       # @return [True]
       # @example Read last journal entry
-      #   j = Systemd::Joural.new
+      #   j = Systemd::Journal.new
       #   j.seek(:tail)
       #   j.move_previous
       #   puts j.current_entry
       def seek(where)
-        rc = case
-             when [:head, :start].include?(where)
-               Native.sd_journal_seek_head(@ptr)
-             when [:tail, :end].include?(where)
-               Native.sd_journal_seek_tail(@ptr)
-             when where.is_a?(Time)
-               Native.sd_journal_seek_realtime_usec(
-                 @ptr,
-                 where.to_i * 1_000_000
-               )
-             when where.is_a?(String)
-               Native.sd_journal_seek_cursor(@ptr, where)
-             else
-               raise ArgumentError, "Unknown seek type: #{where.class}"
-             end
+        rc = if [:head, :start].include?(where)
+          Native.sd_journal_seek_head(@ptr)
+        elsif [:tail, :end].include?(where)
+          Native.sd_journal_seek_tail(@ptr)
+        elsif where.is_a?(Time)
+          Native.sd_journal_seek_realtime_usec(
+            @ptr,
+            where.to_i * 1_000_000
+          )
+        elsif where.is_a?(String)
+          Native.sd_journal_seek_cursor(@ptr, where)
+        else
+          raise ArgumentError, "Unknown seek type: #{where.class}"
+        end
 
         raise JournalError, rc if rc < 0
 
         true
       end
+
+      private
+
+      # reopen the journal automatically due to reduce memory usage
+      def with_auto_reopen
+        @sd_call_count ||= 0
+
+        ret = yield
+
+        if auto_reopen
+          @sd_call_count += 1
+          if @sd_call_count >= auto_reopen
+            begin
+              cursor = self.cursor
+            rescue
+              # Cancel the reopen process if cursor method causes 'Cannot assign requested address' error
+              @sd_call_count = 0
+              return
+            end
+
+            filter_conditions = @reopen_filter_conditions.dup
+
+            close
+            initialize(@reopen_options)
+
+            restore_filters(filter_conditions)
+
+            seek(cursor)
+            # To avoid 'Cannot assign requested address' error
+            # It invokes native API directly to avoid nest with_auto_reopen calls
+            rc = Native.sd_journal_next_skip(@ptr, 0)
+            raise JournalError, rc if rc < 0
+
+            @sd_call_count = 0
+          end
+        end
+
+        ret
+      end
     end
   end
 end

data/lib/systemd/journal/version.rb

@@ -1,6 +1,6 @@
 module Systemd
   class Journal
     # The version of the systemd-journal gem.
-    VERSION = '2.0.0'.freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/lib/systemd/journal/waitable.rb

@@ -1,7 +1,7 @@
 module Systemd
   class Journal
     module Waitable
-      IS_JRUBY = (RUBY_ENGINE == 'jruby')
+      IS_JRUBY = (RUBY_ENGINE == "jruby")
 
       # Block until the journal is changed.
       # @param timeout_usec [Integer] maximum number of microseconds to wait
@@ -21,7 +21,7 @@ module Systemd
         else
           rc = Native.sd_journal_wait(@ptr, timeout_usec)
           raise JournalError, rc if rc.is_a?(Integer) && rc < 0
-          rc == :nop ? nil : rc
+          (rc == :nop) ? nil : rc
         end
       end
 
@@ -50,7 +50,7 @@ module Systemd
       private
 
       def wait_select(timeout_usec)
-        timeout_sec = (timeout_usec == -1 ? nil : timeout_usec / 1e6)
+        timeout_sec = ((timeout_usec == -1) ? nil : timeout_usec / 1e6)
         r, *_ = IO.select([io_object], [], [], timeout_sec)
         r ? reason_for_wakeup : nil
       end
@@ -68,7 +68,7 @@ module Systemd
       def reason_for_wakeup
         rc = Native.sd_journal_process(@ptr)
         raise JournalError, rc if rc.is_a?(Integer) && rc < 0
-        rc == :nop ? nil : rc
+        (rc == :nop) ? nil : rc
       end
     end
   end