nais-log-parser 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d878428a8c1b603fba4aadc59b961a27ebc5b1f7
-  data.tar.gz: 41c0a845f686a899bf31ff0e5f4d86c3245e76fe
+  metadata.gz: b83a347aff499ef4708f4f41c142382f0e8da847
+  data.tar.gz: 1fc518ce15015f3626060fd4e62c3a3218a8cffe
 SHA512:
-  metadata.gz: 2635639cfb6d71839d166de81f188a7483e147886e49bc2ce46f9853f1d5eacd8f8a3eee11d54510d7b0ba782c8893050c370be84cf19b6699221f884945d790
-  data.tar.gz: 847d6f34201203868e1f6f90acb74e342251639a037335c94bd0883b67cdae1ad1898383fc62897fb51e65f13a128461fc61275f96de8fe8b4d9935a04243bed
+  metadata.gz: d991a45c39de1751d27bd18a544b53d72b79794ea20c560b373615a02000ef4c94aaf511c53c36d436c6ed088c8e4ec546c23e35047a642ec32eb40d03d023d1
+  data.tar.gz: e9ba93174d6c27b2cbece3c9b0a4f102d1a9a54f2bb8afe008caefe55ebb5c6190cf5f9ac476074b030a2298c17d334956a08dbff2c017c61ee4e6fdbe3cc24c

data/lib/nais/log/parser.rb

@@ -149,25 +149,29 @@ module Nais
 
       def Parser.parse_influxdb(str)
         if m = str.match(/^\[([^\]]+)\] (.*)$/)
-          comp = m[1]
-          log = m[2]
           r = {}
+          comp = m[1]
+          msg = m[2]
           if comp == 'httpd'
-            ar, ext = parse_accesslog(log)
+            ar, ext = parse_accesslog(msg)
             unless ar.nil?
               r = ar
+              r['message'] = r.delete('request')
               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['request'] = 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['component'] = comp
+          if m = msg.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
+            r['message'] = m[2]
+          elsif r['message'].nil?
+            r['message'] = msg
           end
-          r['component'] = comp
           return r
         else
           return nil

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler