nais-log-parser 0.13.1 → 0.13.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/nais/log/parser/version.rb +1 -1
- data/lib/nais/log/parser.rb +12 -10
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d878428a8c1b603fba4aadc59b961a27ebc5b1f7
|
4
|
+
data.tar.gz: 41c0a845f686a899bf31ff0e5f4d86c3245e76fe
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2635639cfb6d71839d166de81f188a7483e147886e49bc2ce46f9853f1d5eacd8f8a3eee11d54510d7b0ba782c8893050c370be84cf19b6699221f884945d790
|
7
|
+
data.tar.gz: 847d6f34201203868e1f6f90acb74e342251639a037335c94bd0883b67cdae1ad1898383fc62897fb51e65f13a128461fc61275f96de8fe8b4d9935a04243bed
|
data/lib/nais/log/parser.rb
CHANGED
@@ -153,18 +153,20 @@ module Nais
|
|
153
153
|
log = m[2]
|
154
154
|
r = {}
|
155
155
|
if comp == 'httpd'
|
156
|
-
|
157
|
-
|
158
|
-
r
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
r['timestamp'] = Time.strptime(m[1]+"+00:00", "%Y/%m/%d %H:%M:%S%Z").iso8601
|
156
|
+
ar, ext = parse_accesslog(log)
|
157
|
+
unless ar.nil?
|
158
|
+
r = ar
|
159
|
+
if !ext.nil? && m = ext.match(/^ \"([^\"]+)\" \"([^\"]+)\" ([0-9a-f-]+) (\d+)$/)
|
160
|
+
r['referer'] = m[1] unless m[1] == '-'
|
161
|
+
r['user_agent'] = m[2] unless m[2] == '-'
|
162
|
+
r['request_id'] = m[3] unless m[3] == '-'
|
163
|
+
r['processing_time'] = m[4] unless m[4] == '-'
|
164
|
+
end
|
166
165
|
end
|
167
166
|
end
|
167
|
+
if m = log.match(/^(\d{4}\/\d\d\/\d\d \d\d:\d\d:\d\d) /)
|
168
|
+
r['timestamp'] = Time.strptime(m[1]+"+00:00", "%Y/%m/%d %H:%M:%S%Z").iso8601
|
169
|
+
end
|
168
170
|
r['component'] = comp
|
169
171
|
return r
|
170
172
|
else
|