systemd-journal 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfbc842565f8f2b0c02a231336a2398a52d5fd3e
-  data.tar.gz: 55318a3e7b014bbff59acfb837363961ece1817b
+  metadata.gz: 62fda8140f386ef899a2e599ebd0b28dcc4d371e
+  data.tar.gz: 20856e68190c5cb1b62c79baeeeb90a1db5ac009
 SHA512:
-  metadata.gz: 3a0251260147d45da969179dd6053eda8826cf08187e55efd2fa6d83c7994fe75ee82683c4ca9b80770cd3172d21299fe46f960a8bbe975f9e12f2e8fa8cfc62
-  data.tar.gz: 96b8d2c07dae3dca254e36d6b2fefb6c190edd61749ff9a6e941056837fbc8e5c1650727633a900afed77bfd19108ac5d7766d0e14436951721ee494665c23c5
+  metadata.gz: 1501c0de4be3f35d44ed101e2c9f068beb66b14b9554eb61c382430bc1c946d5039ff55a71388ba7acca5a16eed898a25ed1d1164fcd95be1a3dbb24b6971c84
+  data.tar.gz: 8fbb64089d686aeabc530dbd207da49d47ac170fcac504d31291e277cec527f9a2ca957d78c4a68cbe72c253fc645ea8162b19b756e3934d34b9e92d24dfd2e3

data/lib/systemd/id128.rb

@@ -0,0 +1,67 @@
+require 'ffi'
+
+module Systemd
+  module Id128
+
+    # Get the 128-bit hex string identifying the current machine.
+    # Can be used to filter a journal to show only messages originating
+    # from this machine.
+    # @example Filter journal to the current machine.
+    #   j = Systemd::Journal.new
+    #   j.add_match('_MACHINE_ID', Systemd::Id128.machine_id)
+    # @return [String] 128-bit hex string representing the current machine.
+    def self.machine_id
+      @machine_id ||= begin
+                        ptr = FFI::MemoryPointer.new(Native::Id128, 1)
+                        rc = Native.sd_id128_get_machine(ptr)
+                        raise JournalError.new(rc) if rc < 0
+                        Native::Id128.new(ptr).to_s
+                      end
+    end
+
+    # Get the 128-bit hex string identifying the current system's current boot.
+    # Can be used to filter a journal to show only messages originating from
+    # the current boot.
+    # @example Filter journal to the current boot.
+    #   j = Systemd::Journal.new
+    #   j.add_match('_BOOT_ID', Systemd::Id128.boot_id)
+    # @return [String] 128-bit hex string representing the current boot.
+    def self.boot_id
+      @boot_id ||= begin
+                     ptr = FFI::MemoryPointer.new(Native::Id128, 1)
+                     rc = Native.sd_id128_get_boot(ptr)
+                     raise JournalError.new(rc) if rc < 0
+                     Native::Id128.new(ptr).to_s
+                   end
+    end
+
+    # Get a random 128-bit hex string.
+    # @return [String] 128-bit random hex string.
+    def self.random
+      ptr = FFI::MemoryPointer.new(Native::Id128, 1)
+      rc = Native.sd_id128_randomize(ptr)
+      raise JournalError.new(rc) if rc < 0
+      Native::Id128.new(ptr).to_s
+    end
+
+    # providing bindings to the systemd-id128 library.
+    module Native
+      require 'ffi'
+      extend FFI::Library
+      ffi_lib %w[libsystemd-id128.so libsystemd-id128.so.0]
+
+      class Id128 < FFI::Union
+        layout :bytes,  [:uint8, 16],
+               :dwords, [:uint32, 4],
+               :qwords, [:uint64, 2]
+
+        def to_s
+          ("%02x" * 16) % self[:bytes].to_a
+        end
+      end
+      attach_function :sd_id128_get_machine, [:pointer], :int
+      attach_function :sd_id128_get_boot,    [:pointer], :int
+      attach_function :sd_id128_randomize,   [:pointer], :int
+    end
+  end
+end

data/lib/systemd/journal/fields.rb

@@ -0,0 +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 }
+
+    # 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 }
+
+    # Fields used in messages originating from the kernel.
+    KERNEL_FIELDS = %w{ _KERNEL_DEVICE _KERNEL_SUBSYSTEM _UDEV_SYSNAME _UDEV_DEVNODE _UDEV_DEVLINK }
+
+  end
+end

data/lib/systemd/journal/native.rb

@@ -27,6 +27,11 @@ module Systemd
       attach_function :sd_journal_restart_data,   [:pointer], :void
       attach_function :sd_journal_enumerate_data, [:pointer, :pointer, :pointer], :int
 
+      # querying
+      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
+
       # event notification
       enum :wake_reason, [
         :nop,

data/lib/systemd/journal/version.rb

@@ -1,6 +1,6 @@
 module Systemd
   class Journal
     # The version of the systemd-journal gem.
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/systemd/journal.rb

@@ -1,7 +1,9 @@
 require 'systemd/journal/native'
 require 'systemd/journal/flags'
 require 'systemd/journal/compat'
+require 'systemd/journal/fields'
 require 'systemd/journal_error'
+require 'systemd/id128'
 
 module Systemd
   # Class to allow interacting with the systemd journal.
@@ -154,11 +156,7 @@ module Systemd
       out_ptr = FFI::MemoryPointer.new(:pointer, 1)
       results = {}
 
-      while
-        rc = Native::sd_journal_enumerate_data(@ptr, out_ptr, len_ptr)
-        raise JournalError.new(rc) if rc < 0
-        break if rc == 0
-
+      while (rc = Native::sd_journal_enumerate_data(@ptr, out_ptr, len_ptr)) > 0
         len = read_size_t(len_ptr)
         key, value = out_ptr.read_pointer.read_string_length(len).split('=', 2)
         results[key] = value
@@ -166,6 +164,43 @@ module Systemd
         yield(key, value) if block_given?
       end
 
+      raise JournalError.new(rc) if rc < 0
+
+      results
+    end
+
+    # Get the list of unique values stored in the journal for the given field.
+    # If passed a block, each possible value will be yielded.
+    # @return [Array] the list of possible values.
+    # @example Fetch all possible boot ids from the journal
+    #   j = Systemd::Journal.new
+    #   j.query_unique('_BOOT_ID')
+    # @example Enumerate machine IDs with a block
+    #   j = Systemd::Journal.new
+    #   j.query_unique('_MACHINE_ID') do |machine_id|
+    #     puts "found machine id #{machine_id}"
+    #   end
+    def query_unique(field)
+      results = []
+      field   = field.to_s.upcase
+      out_ptr = FFI::MemoryPointer.new(:pointer, 1)
+      len_ptr = FFI::MemoryPointer.new(:size_t,  1)
+
+      Native::sd_journal_restart_unique(@ptr)
+
+      if (rc = Native::sd_journal_query_unique(@ptr, field)) < 0
+        raise JournalError.new(rc)
+      end
+
+      while (rc = Native::sd_journal_enumerate_unique(@ptr, out_ptr, len_ptr)) > 0
+        len = read_size_t(len_ptr)
+        results << out_ptr.read_pointer.read_string_length(len).split('=', 2).last
+
+        yield results.last if block_given?
+      end
+
+      raise JournalError.new(rc) if rc < 0
+
       results
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: systemd-journal
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - John Ledbetter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -41,8 +41,10 @@ files:
 - examples/journal_directory.rb
 - examples/ssh_watcher.rb
 - lib/systemd-journal.rb
+- lib/systemd/id128.rb
 - lib/systemd/journal.rb
 - lib/systemd/journal/compat.rb
+- lib/systemd/journal/fields.rb
 - lib/systemd/journal/flags.rb
 - lib/systemd/journal/native.rb
 - lib/systemd/journal/version.rb
@@ -67,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to libsystemd-journal