logfile_interval 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7f2e7cabde319d9e316d67b25f41786d30a3a65
-  data.tar.gz: 31af6fa687dbd9368e13faa64154ce778d27f3a2
+  metadata.gz: fb3032305ac05c92d90932759dad187ae7d73224
+  data.tar.gz: 4c26ef238239e8df6666ed8c506d67f1c25f0496
 SHA512:
-  metadata.gz: bafa4a0527c1c2b33479ce61276830c39ca588648c95a22e39660e3c26ec410dcdeaf9c47453902619347e6f7b15dcdb40d0dfb8ef8a6fb8e2584882a3b77ffc
-  data.tar.gz: 0dcafb906ba7c9ad3e2e88733858e8e54cfa9a54ae8e9f94a3e3acc6d4a14b87c4193541d1af98620bdac73ebd2ad3721815b56fa4ecf282e6bcb93d46be1855
+  metadata.gz: 658b93a7d5fda1a1608b5cb794b4be565bbc2fa3ff960488dc2751ee8e7c64c097fc6bdadd16778de7000078ec0545efd1433bcf67d0421a45912beb8ed03d39
+  data.tar.gz: 10bc1d338042fefe6aa3a61e5d19edc6a34c0f0d020227569da01838571854e8fc05b15b4777a67c890c7fd1023b80042afbdf7893d569f6d3a0e77882b776bd

data/lib/logfile_interval/aggregator_set.rb

@@ -12,7 +12,9 @@ module LogfileInterval
     def add(record)
       @parser_columns.each do |name, options|
         next unless @aggregators[name]
-        next unless options[:noskip] || !record.skip_with_exceptions?
+        if record.skip_with_exceptions? && (!options.key?(:noskip) || options[:noskip] == false)
+          next
+        end
 
         group_by_value = record[options[:group_by]] if options[:group_by]
         @aggregators[name].add(record[name], group_by_value)

data/lib/logfile_interval/parsed_line/parser.rb

@@ -70,6 +70,14 @@ module LogfileInterval
           end
         end
 
+        skip_columns_with_exceptions.each do |options|
+          val = match_data[options[:pos]]
+          if val =~ options[:regex]
+            data[:skip_with_exceptions] = true
+            break
+          end
+        end
+
         data
       end
 

data/lib/logfile_interval/version.rb

@@ -1,3 +1,3 @@
 module LogfileInterval
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logfile_interval
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Philippe Le Rohellec