systemd-journal 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f33c8fad86b5eee9fa452aefe9b33984383cea940b21075c6394c1a1d4ce85ef
-  data.tar.gz: fb07b5691db94be4abb21e7b2ca9a9541be0863e11e3899dcd55c16e52661a43
+  metadata.gz: 189453bd430728113357d90bca13700af3f2f9f0e5ca48645a95ba8ee07b7efc
+  data.tar.gz: 2956619d81630a3812c4a487b8defe08611f63e1d2a7fedea33aaa525a686ed1
 SHA512:
-  metadata.gz: 2345a7cb623c6998f2f2aee2136e55b6c79278fd9fe5b223f548cbcf3f0b176cbe58e019f19a9a0ee547015a3f0f3b969509eb488f1feb86464412f357f821ea
-  data.tar.gz: '09323d66962413d09ebb444d0667d1d3d35cb4208ea388910233bb2a28368de63b97f2cd1a8d046bc205c872cb2f348f4a8fa4bcc41b715012cc7c149937af4a'
+  metadata.gz: c04fb459d751bde66821602d51613dbcf6e52055bc5d9a1411da5f71177a096a0eabddf7b75465c23df637b52147d3033905d71bb53d58705fff2f27cd04322d
+  data.tar.gz: 26681192b834375a1089b2c1d4bcc33ea9f036b46e7719f1eda4ddff8df0f0f968f7e1d9b0cb5683d737ce2a69aa2dc82c1dadc11a291fc7b862d04cc16f5ece

data/lib/systemd/id128.rb

@@ -43,6 +43,7 @@ module Systemd
     module Native
       require "ffi"
       extend FFI::Library
+
       ffi_lib %w[ libsystemd.so.0 libsystemd.so
         libsystemd-id128.so.0 libsystemd-id128.so ]
 

data/lib/systemd/journal/native.rb

@@ -8,6 +8,7 @@ module Systemd
       # rubocop:disable Layout/LineLength
       require "ffi"
       extend FFI::Library
+
       ffi_lib %w[ libsystemd.so.0 libsystemd.so
         libsystemd-journal.so.0 libsystemd-journal.so]
 
@@ -78,7 +79,7 @@ module Systemd
 
       # writing
       attach_function :sd_journal_print, [:int, :string], :int
-      attach_function :sd_journal_send, [:varargs], :int
+      attach_function :sd_journal_send, [:string, :varargs], :int
       attach_function :sd_journal_perror, [:string], :int
       attach_function :sd_journal_stream_fd, [:string, :int, :bool], :int
 

data/lib/systemd/journal/version.rb

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

data/lib/systemd/journal/writable.rb

@@ -78,8 +78,7 @@ module Systemd
             [:string, "#{k.to_s.upcase}=#{value}"]
           end
           # add a null pointer to terminate the varargs
-          items += [:string, nil]
-          rc = Native.sd_journal_send(*items)
+          rc = Native.sd_journal_send(*items[1..], :pointer, nil)
           raise JournalError, rc if rc < 0
         end
       end

data/lib/systemd/journal.rb

@@ -263,7 +263,7 @@ module Systemd
         Native.sd_journal_open_directory(ptr, opts[:path], 0)
       when :files, :file
         files = Array(opts[type])
-        @open_target = "file#{files.one? ? "" : "s"}:#{files.join(",")}"
+        @open_target = "file#{"s" unless files.one?}:#{files.join(",")}"
         Native.sd_journal_open_files(ptr, array_to_ptrs(files), 0)
       when :container
         @open_target = "container:#{opts[:container]}"

data/lib/systemd/journal_error.rb

@@ -18,6 +18,7 @@ module Systemd
     # @private
     module LIBC
       extend FFI::Library
+
       ffi_lib FFI::Library::LIBC
 
       attach_function :strerror, [:int], :string

data/spec/systemd/journal_spec.rb

@@ -480,10 +480,32 @@ RSpec.describe Systemd::Journal do
   describe "message" do
     it "escapes percent signs in messages" do
       expect(Systemd::Journal::Native).to receive(:sd_journal_send)
-        .with(:string, "MESSAGE=hello %% world %%", :string, nil)
+        .with("MESSAGE=hello %% world %%", :string, "CUSTOM_FIELD=test", :pointer, nil)
         .and_return(0)
 
-      Systemd::Journal.message(message: "hello % world %")
+      Systemd::Journal.message(message: "hello % world %", custom_field: "test")
+    end
+
+    it "sends message to journal" do
+      Systemd::Journal.message(message: "test message")
+    end
+
+    it "sends message with priority and custom field to journal" do
+      Systemd::Journal.message(
+        message: "test message",
+        priority: Systemd::Journal::LOG_ERR,
+        custom_field: "hello world"
+      )
+
+      j = Systemd::Journal.new
+      j.seek(:tail)
+      j.move_previous
+
+      expect(j.current_entry).to have_attributes(
+        message: "test message",
+        custom_field: "hello world",
+        priority: Systemd::Journal::LOG_ERR.to_s
+      )
     end
   end
 
@@ -495,5 +517,18 @@ RSpec.describe Systemd::Journal do
 
       Systemd::Journal.print(Systemd::Journal::LOG_DEBUG, "hello % world %")
     end
+
+    it "prints to journal" do
+      Systemd::Journal.print(Systemd::Journal::LOG_DEBUG, "hello % world !")
+
+      j = Systemd::Journal.new
+      j.seek(:tail)
+      j.move_previous
+
+      expect(j.current_entry).to have_attributes(
+        message: "hello % world !",
+        priority: Systemd::Journal::LOG_DEBUG.to_s
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - John Ledbetter
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal
 test_files: []