haproxy2rpm 0.0.4 → 0.0.5

data/Rakefile

@@ -19,6 +19,6 @@ namespace :test do
     uri = ENV['uri'] || '/'
     puts 'make sure the udp server is running'
 
-    `yes '<13>May 19 18:30:17 localhost haproxy[674]: 127.0.0.1:33319 [15/Oct/2003:08:31:57] relais-http Srv1 6559/100/7/147/6723 #{status_code} 243 - - ---- 1/3/5 0/0 "PUT #{uri} HTTP/1.0"' | nc -u -i 1 localhost #{port}`
+    `yes '<13>May 19 18:30:17 haproxy[674]: 127.0.0.1:33319 [15/Oct/2003:08:31:57] relais-http Srv1 6559/100/7/147/6723 #{status_code} 243 - - ---- 1/3/5 0/0 "PUT #{uri} HTTP/1.0"' | nc -u -i 1 localhost #{port}`
   end
 end

data/lib/haproxy2rpm.rb

@@ -38,7 +38,7 @@ module Haproxy2Rpm
   def self.default_run(log_file,options)
     EventMachine.run do
       EventMachine::file_tail(log_file) do |filetail, line|
-        @rpm.send(line)
+        @rpm.process_and_send(line)
       end
     end
   end

data/lib/haproxy2rpm/rpm.rb

@@ -9,14 +9,18 @@ module Haproxy2Rpm
       @qt_stat = @stats_engine.get_stats_no_scope('WebFrontend/QueueTime')
     end
 
-    def send(line)
+    def process_and_send(line)
       request = LineParser.new(line)
-      NewRelic::Agent.record_transaction(
-        request.tr / 1000.0,
-        'metric' => "Controller#{request.path}",
-        'is_error' => request.is_error?,
-        'error_message' => "#{request.uri} : Status code #{request.status_code}"
-      )
+      params = {
+        'metric' => "Controller#{request.http_path}"
+      }
+
+      if request.is_error?
+        params['is_error'] = true
+        params['error_message'] = "#{request.uri} : Status code #{request.status_code}"
+      end
+
+      NewRelic::Agent.record_transaction(request.tr / 1000.0, params)
       @qt_stat.record_data_point(request.tw / 1000.0)
     end
   end

data/lib/haproxy2rpm/syslog.rb

@@ -4,37 +4,11 @@ module Haproxy2Rpm
   class SyslogHandler < EventMachine::Connection
     def initialize
       @rpm = Rpm.new
-      @count = 0
-      @buffer = BufferedTokenizer.new
-      @start = Time.now
-
-      # The syslog parsing stuff here taken from the 'logporter' gem.
-      pri = "(?:<(?<pri>[0-9]{1,3})>)?"
-      month = "(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"
-      day = "(?: [1-9]|[12][0-9]|3[01])"
-      hour = "(?:[01][0-9]|2[0-4])"
-      minute = "(?:[0-5][0-9])"
-      second = "(?:[0-5][0-9])"
-      time = [hour, minute, second].join(":")
-      timestamp = "(?<timestamp>#{month} #{day} #{time})"
-      hostname = "(?<hostname>[A-Za-z0-9_.:]+)"
-      header = timestamp + " " + hostname
-      message = "(?<message>[ -~]+)"  # ascii 32 to 126
-      re = "^#{pri}#{header} #{message}$"
-
-      if RUBY_VERSION =~ /^1\.8/
-        # Ruby 1.8 doesn't support named captures
-        # replace (?<foo> with (
-        re = re.gsub(/\(\?<[^>]+>/, "(")
-      end
-
-      @syslog3164_re = Regexp.new(re)
-    end
+     end
 
     def receive_data(data)
-      puts data
-      m = @syslog3164_re.match(data)
-      @rpm.send(m[:message])
+      message_start_index = data.index('haproxy')
+      @rpm.process_and_send(data[message_start_index..-1])
     end
   end
 end

data/lib/haproxy2rpm/version.rb

@@ -1,3 +1,3 @@
 module Haproxy2Rpm
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,71 +1,91 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: haproxy2rpm
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Patrick Huesler
 - Martin Rehfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-11 00:00:00.000000000 +02:00
+
+date: 2011-07-11 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: newrelic_rpm
-  requirement: &2157686580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2157686580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: eventmachine-tail
-  requirement: &2157686160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2157686160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2157712860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157712860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: shoulda-context
-  requirement: &2157712440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2157712440
+  version_requirements: *id004
 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
 - Gemfile
 - README.md
@@ -84,28 +104,37 @@ files:
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Sending haproxy logs to new relic rpm
-test_files:
+test_files: 
 - test/haproxy2pm_test.rb
 - test/test_helper.rb