nais-log-parser 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7224efdfc51810769545a0ea1eeda16f40f7c796
-  data.tar.gz: 5557a41ea23972b8df5ae826559a4c980eb5a1bb
+  metadata.gz: 9b6a7bc268c36858a6b4d7c7b946da78e15a411b
+  data.tar.gz: 3dd75b9d5b88fa05de43c568902a87fde152088d
 SHA512:
-  metadata.gz: e6f0c331a79ed263cadd15be6b25da2ddcd80d53e89f8c484d658cd53fea6fac6e200a3adad1fbadad43aa6b71ce7e67bd6d61c0b4c2190596e7c372e40f3a44
-  data.tar.gz: f05d0d099006cf3a43ecde7aed3e2a8053855194e6d16fbebe334c1dd6d3ffeff562359c7458f4474db7506cf78e4032f419d813f9d6cb8795c5b4945ded6b3d
+  metadata.gz: 915366edfece29a9e4c7aa013a2776ef35c062ad57b301adbf40b30e14f1ce3ec0cf9628f1e3eab59829ff22e2a6662da9b669f6b46e9a6eef644455d45b260b
+  data.tar.gz: '09133910d0d95e05c06f8c8c5ae69e2eaca8bb1411b47d564b2ed6bea4bfe4a5820baf59ea5f36d9ec798776cc6d2404aa9632b9f5b9ab751a618c276ff90b86'

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

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.4.1"
+      VERSION = "0.5.0"
     end
   end
 end

data/lib/nais/log/parser.rb

@@ -1,4 +1,5 @@
 require "nais/log/parser/version"
+require "time"
 
 module Nais
   module Log
@@ -68,6 +69,47 @@ module Nais
         }
         r
       end
+
+      def Parser.parse_accesslog(str)
+        if m = str.match(/^(\S+) +(?:(\S+) )?(\S+) \[([^\]]+)\] \"([^\"]*)\" (\S+) (\S+)(.*)/)
+          r = {}
+          r['remote_ip'] = m[1]
+          r['ident'] = m[2] unless (m[2].nil? || m[2] == '-')
+          r['user'] = m[3] unless m[3] == '-'
+          r['timestamp'] = Time.strptime(m[4], "%d/%b/%Y:%H:%M:%S %Z").iso8601
+          r['request'] = m[5]
+          r['response_code'] = m[6] unless m[6] == '-'
+          r['content_length'] = m[7] unless m[7] == '-'
+          ext = m[8] unless m[8] == ''
+          return r, ext
+        else
+          return nil
+        end
+      end
+
+      def Parser.parse_glog(str)
+        if m = str.match(/^([IWEF])(\d{4} \d\d:\d\d:\d\d.\d{6})\s+(\S+)\s([^:]+):(\d+)]\s+(.*)/)
+          r = {}
+          r['level'] = case m[1]
+                       when 'I'
+                         'Info'
+                       when 'W'
+                         'Warning'
+                       when 'E'
+                         'Error'
+                       when 'F'
+                         'Fatal'
+                       end
+          r['timestamp'] = Time.strptime(m[2], "%m%d %H:%M:%S.%N").iso8601(9)
+          r['thread'] = m[3]
+          r['file'] = m[4]
+          r['line'] = m[5]
+          r['message'] = m[6]
+          return r
+        else
+          return nil
+        end
+      end
       
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler