haproxy_log_parser 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/haproxy_log_parser/entry.rb

@@ -15,6 +15,11 @@ module HAProxyLogParser
     # @return [String]
     attr_accessor :frontend_name
 
+    # @return [String]
+    #   '~' if SSL, '' otherwise (HAProxy 1.5 adds a '~' suffix to the frontend
+    #   name if request went through SSL)
+    attr_accessor :transport_mode
+
     # @return [String]
     attr_accessor :backend_name
 
@@ -80,5 +85,10 @@ module HAProxyLogParser
 
     # @return [String]
     attr_accessor :http_request
+
+    # return [true, false] true if and only if request was SSL
+    def ssl?
+      @transport_mode == '~'
+    end
   end
 end

data/lib/haproxy_log_parser/line.treetop

@@ -4,7 +4,7 @@ module HAProxyLogParser
       syslog_portion:([^\[]+ '[' integer ']: ')
       client_ip:ip4_address ':' client_port:integer ' '
       '[' accept_date '] '
-      frontend_name:proxy_name ' '
+      frontend_name:proxy_name transport_mode:'~'? ' '
       backend_name:proxy_name '/' server_name ' '
       tq:integer '/' tw:integer '/' tc:integer '/' tr:integer '/' tt:integer ' '
       status_code:integer ' '

data/lib/haproxy_log_parser.rb

@@ -21,8 +21,8 @@ module HAProxyLogParser
 
       entry = Entry.new
       [
-        :client_ip, :frontend_name, :backend_name, :server_name,
-        :termination_state
+        :client_ip, :frontend_name, :transport_mode,
+        :backend_name, :server_name, :termination_state
       ].each do |field|
         entry.send("#{field}=", result.send(field).text_value)
       end

data/spec/haproxy_log_parser_spec.rb

@@ -11,6 +11,7 @@ describe HAProxyLogParser do
       entry.client_port.should == 34028
       entry.accept_date.should == Time.local(2011, 8, 9, 20, 30, 46, 429)
       entry.frontend_name.should == 'proxy-out'
+      expect(entry).to be_ssl
       entry.backend_name.should == 'proxy-out'
       entry.server_name.should == 'cache1'
       entry.tq.should == 1
@@ -41,6 +42,7 @@ describe HAProxyLogParser do
       entry.client_port.should == 50679
       entry.accept_date.should == Time.local(2012, 5, 21, 1, 35, 46, 146)
       entry.frontend_name.should == 'webapp'
+      expect(entry).to_not be_ssl
       entry.backend_name.should == 'webapp_backend'
       entry.server_name.should == 'web09'
       entry.tq.should == 27

data/spec/sample.log

@@ -1,2 +1,2 @@
-Aug  9 20:30:46 localhost haproxy[2022]: 10.0.8.2:34028 [09/Aug/2011:20:30:46.429] proxy-out proxy-out/cache1 1/0/2/126/+128 301 +223 - - ---- 617/523/336/168/0 0/0 {www.sytadin.equipement.gouv.fr||http://trafic.1wt.eu/} {Apache|230|||http://www.sytadin.} "GET http://www.sytadin.equipement.gouv.fr/ HTTP/1.1"
+Aug  9 20:30:46 localhost haproxy[2022]: 10.0.8.2:34028 [09/Aug/2011:20:30:46.429] proxy-out~ proxy-out/cache1 1/0/2/126/+128 301 +223 - - ---- 617/523/336/168/0 0/0 {www.sytadin.equipement.gouv.fr||http://trafic.1wt.eu/} {Apache|230|||http://www.sytadin.} "GET http://www.sytadin.equipement.gouv.fr/ HTTP/1.1"
 May 21 01:35:46 10.18.237.5 haproxy[26747]: 192.168.1.215:50679 [21/May/2012:01:35:46.146] webapp webapp_backend/web09 27/0/1/0/217 200 1367 session=abc session=xyz ---- 600/529/336/158/0 0/0 {#7C#7C #7B5F41#7D|http://google.com/|} {1270925568||} "GET /images/image.gif HTTP/1.1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haproxy_log_parser
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Toby Hsieh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-19 00:00:00 -08:00
+date: 2013-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency