haproxy2rpm 0.0.5 → 0.0.6

data/README.md

@@ -30,3 +30,12 @@ Tell haproxy to log to syslog. e.g:
 * Apdex
 * Histogram
 * Web transactions
+
+## Known issues
+
+* Seems to stall after some time running
+* Do not run with --daemonize when used inside monit.rc
+
+## Roadmap
+
+* Improved logging and debugging (-l, --log)

data/bin/haproxy2rpm

@@ -4,17 +4,20 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'rubygems'
 require 'optparse'
+require 'logger'
 
 options = {
   :daemonize => false,
   :version => false,
   :syslog => false,
   :port => 3333,
-  :listen => '0.0.0.0'
+  :address => '0.0.0.0',
+  :log_to => STDOUT,
+  :log_level => Logger::INFO
 }
 
 opts = OptionParser.new do |opts|
-  opts.on("-D", "--daemonize", "Daemonize") do
+  opts.on("-d", "--daemonize", "Daemonize") do
     options[:daemonize] = true
   end
 
@@ -22,8 +25,8 @@ opts = OptionParser.new do |opts|
     options[:syslog] = true
   end
 
-  opts.on("-lIP", "--listen IP", "Set IP to listen on") do |ip|
-    options[:listen] = ip
+  opts.on("-aHOST", "--address HOST", "Set host address to listen on") do |host|
+    options[:address] = host
   end
 
   opts.on("-pPORT", "--port PORT", "Set port to listen on") do |port|
@@ -38,6 +41,19 @@ opts = OptionParser.new do |opts|
     options[:env] = env
   end
 
+  opts.on("-PFILE", "--pid FILE", "specify Pid file") do |file|
+    options[:pid] = file
+  end
+
+  opts.on("-lFILE", "--log FILE", "File to redirect output") do |file|
+    options[:log_to] = File.open(file, 'a')
+    options[:log_to].sync = true
+  end
+
+  opts.on("-D", "--debug", "verbose logging") do
+    options[:log_level] = Logger::DEBUG
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -52,6 +68,10 @@ opts.parse!
 
 require 'haproxy2rpm'
 
+
+Haproxy2Rpm.logger = Logger.new(options[:log_to])
+Haproxy2Rpm.logger.level = options[:log_level]
+
 log_file = ARGV[0] || ''
 
 if(options[:version])

data/lib/haproxy2rpm/rpm.rb

@@ -1,7 +1,7 @@
 module Haproxy2Rpm
   class Rpm
     def initialize(options = {})
-      agent_options = {}
+      agent_options = {:log => Haproxy2Rpm.logger}
       agent_options[:app_name] = options[:app_name] if options[:app_name]
       agent_options[:env] = options[:env] if options[:env]
       NewRelic::Agent.manual_start agent_options
@@ -21,7 +21,9 @@ module Haproxy2Rpm
       end
 
       NewRelic::Agent.record_transaction(request.tr / 1000.0, params)
-      @qt_stat.record_data_point(request.tw / 1000.0)
+      Haproxy2Rpm.logger.debug "RECORDING (transaction): #{params.inspect}"
+      result = @qt_stat.record_data_point(request.tw / 1000.0)
+      Haproxy2Rpm.logger.debug "RECORDING (data point): wait time #{request.tw}, #{result.inspect}"
     end
   end
 end

data/lib/haproxy2rpm/syslog.rb

@@ -8,7 +8,9 @@ module Haproxy2Rpm
 
     def receive_data(data)
       message_start_index = data.index('haproxy')
-      @rpm.process_and_send(data[message_start_index..-1])
+      message = data[message_start_index..-1]
+      Haproxy2Rpm.logger.debug "RECEIVED (syslog): #{message}"
+      @rpm.process_and_send(message)
     end
   end
 end

data/lib/haproxy2rpm/version.rb

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

data/lib/haproxy2rpm.rb

@@ -10,10 +10,15 @@ require "haproxy2rpm/syslog"
 require "haproxy2rpm/rpm"
 
 module Haproxy2Rpm
+
+  class << self 
+    attr_accessor :logger
+  end
+
   def self.run(log_file, options)
     @rpm = Rpm.new(options)
     if(options[:daemonize])
-      puts 'daemonizing'
+      logger.info 'daemonizing'
       run_daemonized(log_file, options)
     else
       if(options[:syslog])
@@ -25,13 +30,13 @@ module Haproxy2Rpm
   end
 
   def self.stop
-    puts 'stopping new relic agent'
+    logger.info 'stopping new relic agent'
     NewRelic::Agent.shutdown
   end
 
   def self.run_syslog_server(options)
     EventMachine::run do
-      EventMachine::open_datagram_socket(options[:listen], options[:port], SyslogHandler)
+      EventMachine::open_datagram_socket(options[:address], options[:port], SyslogHandler)
     end
   end
 
@@ -54,8 +59,8 @@ module Haproxy2Rpm
             default_run(log_file, options)
           end
         rescue => e
-          puts e.message
-          puts e.backtrace.join("\n")
+          logger.error e.message
+          logger.error e.backtrace.join("\n")
           abort "There was a fatal system error while starting haproxy2rpm"
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haproxy2rpm
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Patrick Huesler
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 +02:00
+date: 2011-07-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency