haproxy2rpm 0.0.8 → 0.0.9

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 log/*
 newrelic.yml
 .rvmrc
+*.rbc

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 1.8.7
+  - ree
+  - rbx-2.0
+  - jruby

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v 0.0.9
+
+* Support syslog message format (Knut Nesheim)
+
 ## v 0.0.8
 
 * config file similar to unicorn.rb

data/README.md

@@ -36,12 +36,46 @@ Check the examples folder
 * Histogram
 * Web transactions
 
+## Supported Ruby versions
+
+Tested in production
+
+* mri-1.9.2-p180
+* ree-1.8.7-2011.03
+* mri-1.8.7-p33
+
+Passing manual integration test with test logs
+
+* mri-1.9.2-p180
+* ree-1.8.7-2011.03
+* mri-1.8.7-p33
+* jruby 1.6.2
+
+rbx-head fails to write to the local db file: 
+
+    Error serializing data to disk: #<TypeError: incompatible marshal file format (can't be read)format version 4.8 required
+
+
+Passing unit tests
+
+* mri-1.9.2-p180
+* ree-1.8.7-2011.03
+* mri-1.8.7-p33
+* rbx-head
+* jruby 1.6.2
+
+## Performance
+
+No performance testing done so fare. Judging by the results of [jordansissel](https://github.com/jordansissel/experiments/tree/master/ruby/eventmachine-speed), MRI 1.9.2 and jRuby should be the fastest.
+
 ## Known issues
 
 * Daemonize is broken. Does not work nicely with new relic agent
+* Does not work with Rubinius
  
 ## Roadmap
 
 * Working daemonized mode
-* remove haproxy dependency and make it a more generic rpm recorder that
-  works over syslog and log files. This would allow to send custom messages to rpm by just sending log lines through syslog. The haproxy part would be more of a strategy. That means we need to make it easyly extendible without forking or creating a new gem
+* remove haproxy dependency and make it a more generic rpm recorder. Maybe change the name to log2rpm or log4rpm
+* Automated benchmarks to see how fast it performs and what Ruby version
+  might be best suited for a use case

data/Rakefile

@@ -4,6 +4,11 @@ require 'rake/testtask'
 
 task :default => ['test:units']
 
+def rubies
+  require 'yaml'
+  rubies = YAML.load_file('.travis.yml')['rvm']
+end
+
 namespace :test do
   Rake::TestTask.new(:units) do |t|
     t.libs << "test"
@@ -12,6 +17,20 @@ namespace :test do
     t.verbose = true
   end
 
+  desc 'run bundle install for all rubies'
+  task :prepare_rubies do
+    rubies.each do |ruby_version|
+      puts `rvm use #{ruby_version} && gem install bundler && bundle`
+    end
+  end
+
+  desc 'run test suite with all ruby versions'
+  task :multi_ruby do
+    rubies.each do |ruby_version|
+      puts `rvm use #{ruby_version} && bundle exec rake`
+    end
+  end
+
   desc 'send udp log lines for testing purposes'
   task :send_udp_log_lines do
     port = ENV['port'] || 3333

data/lib/haproxy2rpm/line_parser.rb

@@ -3,7 +3,12 @@ module Haproxy2Rpm
 
     def initialize(line)
       @line = line
-      @parts = line.split("\s")
+
+      if @line.match "haproxy"
+        @parts = @line.split("haproxy")[1].split("\s")
+      else
+        @parts = @line.split("\s")
+      end
     end
 
     def tq

data/lib/haproxy2rpm/rpm.rb

@@ -25,7 +25,7 @@ module Haproxy2Rpm
     def process_and_send(line)
       message = message_parser.call(line)
       if(message)
-        request_recorder.call(message_parser.call(line))
+        request_recorder.call(message)
       else
         Haproxy2Rpm.logger.warn "Parser returned an empty message from line #{line}"
       end

data/lib/haproxy2rpm/version.rb

@@ -1,3 +1,3 @@
 module Haproxy2Rpm
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/rpm_test.rb

@@ -94,4 +94,4 @@ class RpmTest < Test::Unit::TestCase
       @instance.process_and_send('12')
     end
   end
-end
+end

data/test/test_helper.rb

@@ -31,6 +31,6 @@ def log_entry(options = {})
             }
   defaults.merge!(options)
   log_line = <<LOG_LINE
-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"
+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"
 LOG_LINE
 end

metadata

@@ -1,106 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: haproxy2rpm
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Patrick Huesler
 - Martin Rehfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70309583696800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine-tail
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70309583696800
+- !ruby/object:Gem::Dependency
+  name: eventmachine-tail
+  requirement: &70309583696140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70309583696140
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70309583695480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda-context
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70309583695480
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
+  requirement: &70309583694680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70309583694680
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70309583694100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70309583694100
 description: Sending haproxy logs to new relic rpm
-email: 
+email:
 - patrick.huesler@wooga.com
 - martin.rehfeld@wooga.com
-executables: 
+executables:
 - haproxy2rpm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -122,41 +99,31 @@ files:
 - test/haproxy2pm_test.rb
 - test/rpm_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/wooga/haproxy2rpm
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Sending haproxy logs to new relic rpm
-test_files: 
+test_files:
 - test/fixtures/config.rb
 - test/haproxy2pm_test.rb
 - test/rpm_test.rb