From b57881c86de4e7406ca537b5285f27d7130b0073 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 8 Mar 2011 16:52:43 -0800 Subject: [PATCH] linux-listener-stats: do not load aggregate for single snapshot This is only useful when looped inside screen or something similar... --- examples/linux-listener-stats.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/linux-listener-stats.rb b/examples/linux-listener-stats.rb index 9493931..5826296 100755 --- a/examples/linux-listener-stats.rb +++ b/examples/linux-listener-stats.rb @@ -8,12 +8,6 @@ require 'raindrops' require 'optparse' require 'ipaddr' require 'time' -begin - require 'aggregate' -rescue LoadError - $stderr.puts "Aggregate missing, USR1 and USR2 handlers unavailable" -end - usage = "Usage: #$0 [-d DELAY] [-t QUEUED_THRESHOLD] ADDR..." ARGV.size > 0 or abort usage delay = false @@ -22,8 +16,21 @@ queued_thresh = -1 trap(:INT) { exit 130 } trap(:PIPE) { exit 0 } +opts = OptionParser.new('', 24, ' ') do |opts| + opts.banner = usage + opts.on('-d', '--delay=DELAY', Float) { |n| delay = n } + opts.on('-t', '--queued-threshold=INT', Integer) { |n| queued_thresh = n } + opts.parse! ARGV +end + +begin + require 'aggregate' +rescue LoadError + $stderr.puts "Aggregate missing, USR1 and USR2 handlers unavailable" +end if delay + agg_active = agg_queued = nil -if defined?(Aggregate) +if delay && defined?(Aggregate) agg_active = Aggregate.new agg_queued = Aggregate.new @@ -46,13 +53,6 @@ if defined?(Aggregate) $stderr.puts "USR1(dump_aggregate) and USR2(reset) handlers ready for PID=#$$" end -opts = OptionParser.new('', 24, ' ') do |opts| - opts.banner = usage - opts.on('-d', '--delay=DELAY', Float) { |n| delay = n } - opts.on('-t', '--queued-threshold=INT', Integer) { |n| queued_thresh = n } - opts.parse! ARGV -end - ARGV.each do |addr| addr =~ %r{\A(127\..+):(\d+)\z} or next host, port = $1, $2 -- 2.11.4.GIT