nais-log-parser 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17bf6d010e84ac008a03740078c0750e7baa1e3e
-  data.tar.gz: 546d7f974465db93c0f5696e1b095ef592390c0d
+  metadata.gz: d878428a8c1b603fba4aadc59b961a27ebc5b1f7
+  data.tar.gz: 41c0a845f686a899bf31ff0e5f4d86c3245e76fe
 SHA512:
-  metadata.gz: 85ee1cda2a79b53bc898b382ab0adaf78bd275c31d7cd27a005b53b5c2743aa7231b11e7f7b2b3def7438dcfa976cae76bce8b25bbae95ee59407d820ab10670
-  data.tar.gz: 386c84b8b4c846951e8085cf99b480f246c33710020c32ad53695dc3bafe01b4e143056981b0479cb47fcbcd0e423305f8a7fbeab0fe27f93965b715102211f2
+  metadata.gz: 2635639cfb6d71839d166de81f188a7483e147886e49bc2ce46f9853f1d5eacd8f8a3eee11d54510d7b0ba782c8893050c370be84cf19b6699221f884945d790
+  data.tar.gz: 847d6f34201203868e1f6f90acb74e342251639a037335c94bd0883b67cdae1ad1898383fc62897fb51e65f13a128461fc61275f96de8fe8b4d9935a04243bed

data/lib/nais/log/parser/version.rb

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.13.1"
+      VERSION = "0.13.2"
     end
   end
 end

data/lib/nais/log/parser.rb

@@ -153,18 +153,20 @@ module Nais
           log = m[2]
           r = {}
           if comp == 'httpd'
-            r, ext = parse_accesslog(log)
-            if !r.nil? && !ext.nil? && m = ext.match(/^ \"([^\"]+)\" \"([^\"]+)\" ([0-9a-f-]+) (\d+)$/)
-              r['referer'] = m[1] unless m[1] == '-'
-              r['user_agent'] = m[2]  unless m[2] == '-'
-              r['request_id'] = m[3] unless m[3] == '-'
-              r['processing_time'] = m[4] unless m[4] == '-'
-            end
-          else
-            if m = log.match(/^(\d{4}\/\d\d\/\d\d \d\d:\d\d:\d\d) /)
-              r['timestamp'] = Time.strptime(m[1]+"+00:00", "%Y/%m/%d %H:%M:%S%Z").iso8601
+            ar, ext = parse_accesslog(log)
+            unless ar.nil?
+              r = ar
+              if !ext.nil? && m = ext.match(/^ \"([^\"]+)\" \"([^\"]+)\" ([0-9a-f-]+) (\d+)$/)
+                r['referer'] = m[1] unless m[1] == '-'
+                r['user_agent'] = m[2]  unless m[2] == '-'
+                r['request_id'] = m[3] unless m[3] == '-'
+                r['processing_time'] = m[4] unless m[4] == '-'
+              end
             end
           end
+          if m = log.match(/^(\d{4}\/\d\d\/\d\d \d\d:\d\d:\d\d) /)
+            r['timestamp'] = Time.strptime(m[1]+"+00:00", "%Y/%m/%d %H:%M:%S%Z").iso8601
+          end
           r['component'] = comp
           return r
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Terje Sannum