haproxy2rpm 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v 0.1.1
+
+* BUGFIX: hostnames with hyphens e.g s-app-1 break the syslog parser
+
 ## v 0.1.0
 
 * Make Syslog parsing independent from haproxy

data/lib/haproxy2rpm/syslog.rb

@@ -14,7 +14,7 @@ module Haproxy2Rpm
       second = "(?:[0-5][0-9])"
       time = [hour, minute, second].join(":")
       timestamp = "(?<timestamp>#{month} #{day} #{time})"
-      hostname = "(?<hostname>[A-Za-z0-9_.:]+)"
+      hostname = "(?<hostname>[A-Za-z0-9_.:\-]+)"
       header = timestamp + " " + hostname
       tag = '(?<tag>[a-zA-Z_\-\/\.0-9\[\]]+)'
       message = "(?<message>[ -~]+)"  # ascii 32 to 126
@@ -31,9 +31,10 @@ module Haproxy2Rpm
 
     def receive_data(data)
       match = parse_data(data)
-      puts match.inspect
       message = match ? match[5] : ""
       Haproxy2Rpm.logger.debug "RECEIVED (syslog): #{data}"
+      Haproxy2Rpm.logger.debug "PARSED DATA (syslog): #{match.inspect}"
+      Haproxy2Rpm.logger.debug "PARSED PAYLOAD (syslog): #{message}"
       Haproxy2Rpm.rpm.process_and_send(message)
     end
 

data/lib/haproxy2rpm/version.rb

@@ -1,3 +1,3 @@
 module Haproxy2Rpm
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/syslog_test.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift( File.dirname(__FILE__) )
 
 require 'test_helper'
 
-FIXTURE_SYSLOG_MESSAGE = "<12>Jan  3 16:18:58 rechenschieber.local nodejs[36180]: message"
+FIXTURE_SYSLOG_MESSAGE = "<12>Jan  3 16:18:58 rechenschieber.local nodejs[36180]: OPTIONS / 200 1"
 
 class RpmTest < Test::Unit::TestCase
   context 'regex maching' do
@@ -27,7 +27,19 @@ class RpmTest < Test::Unit::TestCase
     end
 
     should 'match the message' do
-      assert_equal 'message', @match[5]
+      assert_equal 'OPTIONS / 200 1', @match[5]
+    end
+  end
+
+  context 'valid hostnames' do
+    setup do
+      @parser = Haproxy2Rpm::SyslogHandler.new(self)
+    end
+
+    should 'support hostnames with hyphens' do
+      expected_hostname = 's-app-2'
+      actual_hostname = @parser.parse_data(syslog_entry(:hostname => expected_hostname))[3]
+      assert_equal expected_hostname, actual_hostname
     end
   end
 end

data/test/test_helper.rb

@@ -19,6 +19,7 @@ Haproxy2Rpm.logger = DummyLogger.new
 
 def syslog_entry(options = {})
   defaults = {
+                :hostname => 'localhost',
                 :tq => 6559,
                 :tw => 100,
                 :tc => 7,
@@ -31,7 +32,7 @@ def syslog_entry(options = {})
             }
   defaults.merge!(options)
   log_line = <<LOG_LINE
-Aug  1 15:28:03 ip-10-58-122-30.eu-west-1.compute.internal haproxy[674]: 127.0.0.1:33319 [15/Oct/2003:08:31:57] relais-http Srv1 #{defaults[:tq]}/#{defaults[:tw]}/#{defaults[:tc]}/#{defaults[:tr]}/#{defaults[:tt]} #{defaults[:status_code]} 243 - - ---- 1/3/5 0/0 "#{defaults[:http_method]} #{defaults[:http_path]}#{defaults[:http_query] ? "?#{defaults[:http_query]}" : ''} HTTP/1.0"
+<113>Aug  1 15:28:03 #{defaults[:hostname]} haproxy[674]: 127.0.0.1:33319 [15/Oct/2003:08:31:57] relais-http Srv1 #{defaults[:tq]}/#{defaults[:tw]}/#{defaults[:tc]}/#{defaults[:tr]}/#{defaults[:tt]} #{defaults[:status_code]} 243 - - ---- 1/3/5 0/0 "#{defaults[:http_method]} #{defaults[:http_path]}#{defaults[:http_query] ? "?#{defaults[:http_query]}" : ''} HTTP/1.0"
 LOG_LINE
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haproxy2rpm
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Patrick Huesler
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 +01:00
+date: 2012-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency