nais-log-parser 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18d5e7b70d966fa129a0e82f7478e0c0c3c31dc
-  data.tar.gz: 0f2f9df2634708b1d7cc655217187fd390f9164f
+  metadata.gz: 92f7994d955835f001a575b0ff4001cf77a6483d
+  data.tar.gz: 8c49f344e450fced7c2a93fb629c0faa0cf97c6a
 SHA512:
-  metadata.gz: b03948e361406ec475863826b01aaef49939512ce2930b01f265decd75ebbe2c1387bcd30b630b1ec6cf971684eecf17e862250a06451fc9dca5bb5ad5f5cdff
-  data.tar.gz: 5138d0f8abd353a0206d43d4fb016be3befe888cacbdf93e89a9d796e6f2ffe5381c7714cc1886c600f542ee318086a1a6f1a23e3773b45da4e58589bf3e2f7d
+  metadata.gz: 434b03929144db889fb7edacd7eb90f0e7c8c7d8be2db7259832d91a53344eea73efcac5f14d6ae7e51340c14d51cf1c94eea9b53312367ecbadd991b43a2a2d
+  data.tar.gz: 72000f8b16aa93d318e620636735dd8f70c1cc58c130385ddb0c5b6d912e31bbeb02b0901867942090c4a50fcf68d61c71aed98d3c88bd45fe188eed7f202245

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

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.25.0"
+      VERSION = "0.26.0"
     end
   end
 end

data/lib/nais/log/parser.rb

@@ -3,18 +3,23 @@ require "nais/log/parser/version"
 require "time"
 require "json"
 require "logfmt"
+require "uri"
 
 module Nais
   module Log
     module Parser
 
-      def Parser.flatten_hash(hash, path = "")
+      def Parser.flatten_hash(hash, path = "", keep = nil)
         hash.each_with_object({}) do |(k, v), ret|
-          key = (path + k.to_s).tr('.','_')
-          if v.is_a? Hash
-            ret.merge! Parser.flatten_hash(v, key.to_s + "_")
+          if path == "" && !keep.nil? && k =~ keep
+            ret[k] = v
           else
-            ret[key] = v
+            key = (path + k.to_s).tr('.','_')
+            if v.is_a? Hash
+              ret.merge! Parser.flatten_hash(v, key.to_s + "_")
+            else
+              ret[key] = v
+            end
           end
         end
       end
@@ -137,6 +142,43 @@ module Nais
         return r.empty? ? nil : r
       end
 
+      def Parser.parse_uri(str)
+        r = {}
+        unless str.nil?
+          i = str.index('?')
+          if i.nil?
+            r['path'] = URI.decode(str)
+          else
+            if i != 0
+              r['path'] = URI.decode(str[0,i])
+            end
+            if i+1 < str.length
+              query = str[i+1, str.length]
+              kv = {}
+              query.scan(/([^=&]+)=([^&]+)/) do |k,v|
+                k.gsub!(/\+/, ' ')
+                k = URI.decode(k)
+                v.gsub!(/\+/, ' ')
+                v = URI.decode(v)
+                if kv.has_key?(k)
+                  if kv[k].is_a?(Array)
+                    next if kv[k].include?(v)
+                    kv[k].push(v)
+                  else
+                    next if kv[k] == v
+                    kv[k] = [kv[k], v]
+                  end
+                else
+                  kv[k] = v
+                end
+              end
+              r['query_params'] = kv unless kv.empty?
+            end
+          end
+        end
+        r
+      end
+
       def Parser.parse_accesslog(str)
         if !str.nil? && m = str.match(/^(\S+) +(?:(\S+) )?(\S+) \[([^\]]+)\] \"([^\"]*)\" (\S+) (\S+)(.*)/)
           r = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logfmt