RTALogger 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79dce21ae1cfe72961d564f9e750e49db0adcd564885293e971d482b1df6bf87
-  data.tar.gz: 44e1d3ae6c92779f6b69677a103c3614f4b2c03429a917c4f61c801b9ab43574
+  metadata.gz: 7e81de465e520fd877b0a8be28723ca3df6edc4770a06811cd1321a47a9fe009
+  data.tar.gz: ee63b302ec830dcc25cab746f2b5adb6071b2677c1ed4d07884b933946b3e7ca
 SHA512:
-  metadata.gz: 78bcdaa73b75e68da879c9f60fe9f3c0b0f9d914269572dc53fbaa3e02d5f1ecf56c35af42b33794675f3b4299f8a247f83aba846e1e9e2bbea18853a277b81d
-  data.tar.gz: 46b518ac6a9a2df21fd44cfffe3a4ca23e5c6aaba425d8bf5945efb9f590c5a92e945aac407488410f37a897ffb00f42dd0a0d90758eb15495bbab5811ff9bcc
+  metadata.gz: 527aead929bac69790be99d22b5d5e0232c96908f8c7935fb9877a2561b2b4cea82bb3ac4cd5b0f869b677e202d52e6b0bddd3bb845a2154b45436729fd3a9ad
+  data.tar.gz: be339710ef0c3cf2dd045e165062a058ba3b8a509777522f519505888255f051e5994cb8c2929d17797c06d7b8475d7f08b5e37d2c9d6d5ce48155b067c54ba7

data/Gemfile.lock

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

data/lib/RTALogger/version.rb

@@ -1,3 +1,3 @@
 module RTALogger
-  VERSION = '2.2.2'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/lib/log_factory_filter.rb

@@ -9,7 +9,7 @@ module RTALogger
       begin
         load lib_file
       rescue
-        raise "unable to load formatter class file: #{lib_file}"
+        raise "unable to load filter class file: #{lib_file}"
       end
 
       filter_class_name = 'RTALogger::' + ('log_filter_' + type.to_s).split('_').map(&:capitalize).join

data/lib/log_filter_base.rb

@@ -3,11 +3,14 @@ module RTALogger
     def initialize
       @title = self.class.to_s.split('::').last.underscore
       @enable = true
+      @action = :accept
     end
 
     attr_accessor :title
     attr_accessor :enable
     attr_accessor :default_regex
+    # possible values: accept, ignore
+    attr_accessor :action
 
     def match_conditions(log_record)
       return true if !@enable
@@ -18,11 +21,13 @@ module RTALogger
       @title = config_json['title'] if config_json['title'].present?
       @enable = config_json['enable'].nil? ? true : config_json['enable'].present?
       @default_regex = config_json['default_regex'] if config_json['default_regex'].present?
+      @action = valid_action(config_json['action']) if config_json['action'].present?
     end
 
     def apply_run_time_config(config_json)
       @enable = config_json['enable'].nil? ? true : config_json['enable'].present?
       @default_regex = config_json['default_regex'] if config_json['default_regex'].present?
+      @action = valid_action(config_json['action']) if config_json['action'].present?
     end
 
     def to_builder
@@ -35,5 +40,18 @@ module RTALogger
 
       jb
     end
+
+    private
+
+    def valid_action(action_value)
+      case action_value.to_s.downcase
+      when 'accept'
+        :accept
+      when 'ignore'
+        :ignore
+      else
+        :accept
+      end
+    end
   end
 end

data/lib/log_filter_context.rb

@@ -7,7 +7,9 @@ module RTALogger
       result = super
       return result unless result
 
-      return default_regex.present? ? (Regexp.new(@default_regex).match(log_record.context_id.to_s)) : result
+      result = default_regex.present? ? (Regexp.new(@default_regex).match(log_record.context_id.to_s)) : result
+      result = !result if @action == :ignore
+      return result
     end
   end
 end

data/lib/log_filter_message.rb

@@ -7,7 +7,9 @@ module RTALogger
       result = super
       return result unless result
 
-      return default_regex.present? ? (Regexp.new(@default_regex).match(log_record.full_message)) : result
+      result = default_regex.present? ? (Regexp.new(@default_regex).match(log_record.full_message)) : result
+      result = !result if @action == :ignore
+      return result
     end
   end
 end

data/lib/log_filter_topic.rb

@@ -7,7 +7,9 @@ module RTALogger
       result = super
       return result unless result
 
-      return default_regex.present? ? (Regexp.new(@default_regex).match(log_record.topic_title)) : result
+      result = default_regex.present? ? (Regexp.new(@default_regex).match(log_record.topic_title)) : result
+      result = !result if @action == :ignore
+      return result
     end
   end
 end

data/lib/log_manager.rb

@@ -71,6 +71,7 @@ module RTALogger
       config_json = load_config_from_json_file(file_name, title)
       @config_file_name = file_name if config_json
       apply_config(config_json)
+      self
     rescue StandardError => e
       @propagator.drop_all_repositories
       @propagator.add_log_repository(LogFactory.create_repository(:console))
@@ -79,6 +80,7 @@ module RTALogger
     def config_use_json_string(config_string, title = '')
       config_json = load_config_from_json_string(config_string, title)
       apply_config(config_json)
+      self
     rescue StandardError => e
       @propagator.drop_all_repositories
       @propagator.add_log_repository(LogFactory.create_repository(:console))

data/lib/rta_logger_config.json

@@ -27,12 +27,14 @@
             [
               {
                 "type": "topic",
+                "action" : "ignore",
                 "title": "topic_filter_1",
                 "enable": false,
-                "default_regex" : "^test$"
+                "default_regex" : "^test$",
               },
               {
                 "type": "message",
+                "action" : "accept",
                 "title": "message_filter_1",
                 "enable": false,
                 "default_regex" : "error"
@@ -53,9 +55,9 @@
             }
           },
           {
-            "enable": false,
             "title": "fluentd_repo_1",
             "type": "fluentd",
+            "enable": false,
             "host": "localhost",
             "port": "8888",
             "formatter":

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RTALogger
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Babak Bahreini, RTA Backend Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-logger