journald-logger 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9687426a5dfa6a08d6911f0039a2b96baf58f59b
-  data.tar.gz: bbd7f7f9ef41c560dbaff136dcbf7796c7785495
+  metadata.gz: f439b01c80933fbed06d743b60b53a7f3d87ea33
+  data.tar.gz: 1de7b0eda60725b9d6b0f57c54cce300c0ebf9e9
 SHA512:
-  metadata.gz: 6e95eb9a3d24918e802228d5789916ffff5992182a33e4abf1f20fffbf11fc6159b6c394f44e3f34e52060c3b76721ba717a306d3a3976ab7ac569d870985e50
-  data.tar.gz: a995a08142c11a182ab6d8025b82aaf0b1b3d3d1b5d348d194fcaf845b2908e68346bf74abd190560e0fa4ce29d36e2f8d8ad544de10f4198468d247137dde79
+  metadata.gz: 4c9962e13a751093b5f7e62ff6a4218c83d663ae4989ffda7183707e58edf9df1136a44d497b56189b92f8acc93961a791991338921064b81d5c046cc5856938
+  data.tar.gz: 6e1ed32b61eadcdaf19f2c5784c43c20b57e372b3c0085b8a4aa0efd22db5225ed1e171e0076026058f8397e8400c7a6763eef10643aefa506990d1ec6f3d607

data/README.md

@@ -41,6 +41,15 @@ LEVEL_MAP = {
 
 You may notice it's somewhat different from the one from Syslog::Logger
 
+## Setting report level
+
+```ruby
+logger = Journald::Logger.new('gandalf', Journald::LOG_NOTICE) # set minimal reporting level to notice
+logger.min_priority   = Journald::LOG_NOTICE # runtime change of minimal priority
+logger.level          = Logger::WARN # use Logger severity
+logger.sev_threshold  = Logger::INFO # please pay attention that Logger severity lacks several levels e.g. 'notice'
+```
+
 ## Tags
 
 Tags are used to add systemd-journal fields to all subsequent log calls until removed
@@ -86,7 +95,7 @@ logger.log_debug 'Debug'
 begin
   raise "Aw, snap!"
 rescue => e
-  logger.exception e # log exception with LOG_CRIT level by default
+  logger.exception e # log exception with LOG_ERR level by default
   logger.exception e, severity: Logger::WARN        # use Logger severity
   logger.exception e, priority: Journald::LOG_ALERT # use Syslog priority 
 end

data/lib/journald/classes/logger.rb

@@ -4,9 +4,10 @@ module Journald
     include Loggable
     include Sysloggable
 
-    def initialize(progname = nil, tags = {})
+    def initialize(progname = nil, min_priority = nil, tags = {})
       @tags   = tags
       @logger = Native
+      self.min_priority = min_priority
       self.progname = progname
     end
 
@@ -18,6 +19,12 @@ module Journald
       tag(:syslog_identifier, value)
     end
 
+    attr_reader :min_priority
+
+    def min_priority=(value)
+      @min_priority = value ? value.to_i : ::Journald::LOG_DEBUG
+    end
+
     # systemd-journal style
 
     # send systemd-journal message
@@ -84,6 +91,12 @@ module Journald
           key = k.to_s.upcase
           value = v.to_s
 
+          if key == 'PRIORITY'
+            priority = value.to_i
+
+            return 0 if priority > @min_priority # DEBUG = 7, ALERT = 1
+          end
+
           "#{key}=#{value}"
         end
 

data/lib/journald/classes/trace_logger.rb

@@ -1,7 +1,7 @@
 module Journald
   class TraceLogger
-    def initialize(progname = nil, tags = {})
-      @wrapped_logger = Logger.new(progname, tags)
+    def initialize(progname = nil, min_priority = nil, tags = {})
+      @wrapped_logger = ::Journald::Logger.new(progname, min_priority, tags)
     end
 
     PASSTHROUGH_METHODS = [
@@ -9,9 +9,13 @@ module Journald
         :tag_value,
         :untag,
         :progname,
-        :'progname=',
+        :progname=,
         :level,
-        :'level=',
+        :level=,
+        :sev_threshold,
+        :sev_threshold=,
+        :min_priority,
+        :min_priority=,
     ]
 
     METHODS = (

data/lib/journald/modules/exceptionable.rb

@@ -2,7 +2,7 @@ module Journald
   class Logger
     module Exceptionable
       def exception(e, priority: nil, severity: nil)
-        priority ||= severity_to_priority(severity) || Journald::LOG_CRIT
+        priority ||= severity_to_priority(severity) || Journald::LOG_ERR
         real_exception(e, priority, false)
       end
 

data/lib/journald/modules/loggable.rb

@@ -46,7 +46,8 @@ module Journald
         end
 
         define_method("#{severity_key}?".to_sym) do
-          true # journald always logs everything
+          priority = severity_to_priority(severity_value)
+          self.min_priority >= priority
         end
       end
 
@@ -58,15 +59,16 @@ module Journald
 
       # journald always logs everything
       def level
-        ::Logger::DEBUG
+        priority = self.min_priority
+        LEVEL_MAP.select{|_,p| p <= priority}.keys.min
       end
 
-      def sev_threshold
-        ::Logger::DEBUG
+      def level=(severity)
+        self.min_priority = severity_to_priority(severity)
       end
 
-      def level=(_); end
-      def sev_threshold=(_); end
+      alias_method :sev_threshold, :level
+      alias_method :sev_threshold=, :level=
 
       # journald does not require formatter or formatting
       def formatter; end

data/lib/journald/modules/version.rb

@@ -1,5 +1,5 @@
 module Journald
   class Logger
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journald-logger
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Anton Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: journald-native