RTALogger 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72e3d3eb0005d4dcf6ad556e952a15aa354bc5c33c257eb95d595a3d48a69c57
-  data.tar.gz: 6317c92c72a523235002ae18bcc51208b0f6f6b8fa77e620ae098cea6b1316d6
+  metadata.gz: ed82424b9451e92cb8424657eff8192e25e6bcff6aa66eed5e23867dcbe9386a
+  data.tar.gz: 309892ff41c57d310929b27287c0c024406de2bef493ecbd7e25ac04608be14a
 SHA512:
-  metadata.gz: c1a6bf4e33b08c428fc20f38c568bad661c3e79eab55de3238cf1355b6dd070b1f39c441275ee48b7548e037b76bef3b8762f13113e1fdae66759124dedf9568
-  data.tar.gz: dd4c4497c89d9a063aaf42be760254e8aff3edf66fce6a78c24976ffc91c813a82efa5c80fca9c5c86a183f61b34a93b70ac52524834fb077cceff7bf3c7bd66
+  metadata.gz: af198b2b5df5603f541d20aed1e618c4ec61b69f674302c0c6a6433f920f2089e08c24198a414a8ed9ab79556c2f5f95c5610411349a3f0c09ed07e6b9198b3b
+  data.tar.gz: 5ed2d9c7676d9c6713d2706bc27366bb3bdb7c98ed3c04615fe8bf72e6940bb3f7a52d942169358bd43e86f24a3f44217024d738b2a5e68cc5cf568a9885a9f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RTALogger (2.3.1)
+    RTALogger (2.4.0)
       fluent-logger (~> 0.9)
       jbuilder (~> 2.10)
 

data/lib/RTALogger/version.rb

@@ -1,3 +1,3 @@
 module RTALogger
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/lib/log_topic.rb

@@ -22,33 +22,47 @@ module RTALogger
     attr_accessor :severity_level
 
     def trace(context_id, *message)
-      add(context_id, TRACE, message) if @severity_level.to_i <= TRACE.to_i
+      add(context_id, TRACE, message) if trace?
     end
 
     def debug(context_id, *message)
-      add(context_id, DEBUG, message) if @severity_level.to_i <= DEBUG.to_i
+      add(context_id, DEBUG, message) if debug?
     end
 
     def info(context_id, *message)
-      add(context_id, INFO, message) if @severity_level.to_i <= INFO.to_i
+      add(context_id, INFO, message) if info?
     end
 
     def warning(context_id, *message)
-      add(context_id, WARN, message) if @severity_level.to_i <= WARN.to_i
+      add(context_id, WARN, message) if warn?
     end
 
     def error(context_id, *message)
-      add(context_id, ERROR, message) if @severity_level.to_i <= ERROR.to_i
+      add(context_id, ERROR, message) if error?
     end
 
     def fatal(context_id, *message)
-      add(context_id, FATAL, message) if @severity_level.to_i <= FATAL.to_i
+      add(context_id, FATAL, message) if fatal?
     end
 
     def unknown(context_id, *message)
-      add(context_id, UNKNOWN, message) if @severity_level.to_i <= UNKNOWN.to_i
+      add(context_id, UNKNOWN, message) if unknown?
     end
 
+    def trace?; @severity_level.to_i <= TRACE.to_i; end
+
+    def debug?; @severity_level.to_i <= DEBUG.to_i; end
+
+    def info?; @severity_level.to_i <= INFO.to_i; end
+
+    def warn?; @severity_level.to_i <= WARN.to_i; end
+
+    def error?; @severity_level.to_i <= ERROR.to_i; end
+
+    def fatal?; @severity_level.to_i <= FATAL.to_i; end
+
+    def unknown?; @severity_level.to_i <= UNKNOWN.to_i; end
+
     def to_builder
       jb = Jbuilder.new do |json|
         json.title title

data/lib/log_topic_wrapper.rb

@@ -0,0 +1,160 @@
+module RTALogger
+  class LogTopicWrapper
+    def initialize(context_id, topic, level = 0)
+      @context_id = context_id
+      @topic = topic
+      level = level - 1
+      level = 0 if level.negative?
+      level = 5 if level > 5
+      self.level = level
+    end
+
+    attr_accessor :progname
+    attr_accessor :context_id
+
+    # Logging severity.
+    module Severity
+      # Low-level information, mostly for developers.
+      DEBUG = 0
+      # Generic (useful) information about system operation.
+      INFO = 1
+      # A warning.
+      WARN = 2
+      # A handleable error condition.
+      ERROR = 3
+      # An unhandleable error that results in a program crash.
+      FATAL = 4
+      # An unknown message that should always be logged.
+      UNKNOWN = 5
+    end
+    include Severity
+
+    # Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
+    attr_reader :level
+
+    # Set logging severity threshold.
+    #
+    # +severity+:: The Severity of the log message.
+    def level=(severity)
+      if severity.is_a?(Integer)
+        severity = 0 if severity.negative?
+        severity = 5 if severity > 5
+        @level = severity
+      else
+        case severity.to_s.downcase
+        when 'debug'
+          @level = DEBUG
+        when 'info'
+          @level = INFO
+        when 'warn'
+          @level = WARN
+        when 'error'
+          @level = ERROR
+        when 'fatal'
+          @level = FATAL
+        when 'unknown'
+          @level = UNKNOWN
+        else
+          raise ArgumentError, "invalid log level: #{severity}"
+        end
+      end
+    end
+
+    # Returns +true+ iff the current severity level allows for the printing of
+    # +DEBUG+ messages.
+    def debug?;
+      @level <= DEBUG;
+    end
+
+    # Returns +true+ iff the current severity level allows for the printing of
+    # +INFO+ messages.
+    def info?;
+      @level <= INFO;
+    end
+
+    # Returns +true+ iff the current severity level allows for the printing of
+    # +WARN+ messages.
+    def warn?;
+      @level <= WARN;
+    end
+
+    # Returns +true+ iff the current severity level allows for the printing of
+    # +ERROR+ messages.
+    def error?;
+      @level <= ERROR;
+    end
+
+    # Returns +true+ iff the current severity level allows for the printing of
+    # +FATAL+ messages.
+    def fatal?;
+      @level <= FATAL;
+    end
+
+    def add(severity, message = nil, progname = nil)
+      severity ||= UNKNOWN
+
+      if progname.nil?
+        progname = @progname
+      end
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          progname = @progname
+        end
+      end
+
+      rta_logger_topic_log(severity, message)
+
+      true
+    end
+
+    alias log add
+
+    def debug(progname = nil, &block)
+      add(DEBUG, nil, progname, &block)
+    end
+
+    def info(progname = nil, &block)
+      add(INFO, nil, progname, &block)
+    end
+
+    def warn(progname = nil, &block)
+      add(WARN, nil, progname, &block)
+    end
+
+    def error(progname = nil, &block)
+      add(ERROR, nil, progname, &block)
+    end
+
+    def fatal(progname = nil, &block)
+      add(FATAL, nil, progname, &block)
+    end
+
+    def unknown(progname = nil, &block)
+      add(UNKNOWN, nil, progname, &block)
+    end
+
+    private
+
+    def rta_logger_topic_log(severity, message)
+      return if @topic.nil?
+
+      case severity
+      when DEBUG
+        @topic.debug(@context_id, message)
+      when INFO
+        @topic.info(@context_id, message)
+      when WARN
+        @topic.warning(@context_id, message)
+      when ERROR
+        @topic.error(@context_id, message)
+      when FATAL
+        @topic.fatal(@context_id, message)
+      when UNKNOWN
+        @topic.unknown(@context_id, message)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RTALogger
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Babak Bahreini, RTA Backend Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-logger
@@ -91,6 +91,7 @@ files:
 - lib/log_repository_fluentd.rb
 - lib/log_repository_udp.rb
 - lib/log_topic.rb
+- lib/log_topic_wrapper.rb
 - lib/rta_logger_config.json
 - lib/sample.rb
 - lib/severity_level.rb