From 489d08233b2ec43353e25f857e3639751f4f529b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 15 Feb 2011 10:13:15 -0800 Subject: unindent modules No need to clutter/confuse namespace lookups --- lib/raindrops/linux.rb | 9 +++------ lib/raindrops/middleware.rb | 11 ++++------- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'lib') diff --git a/lib/raindrops/linux.rb b/lib/raindrops/linux.rb index ba2d975..6b084b0 100644 --- a/lib/raindrops/linux.rb +++ b/lib/raindrops/linux.rb @@ -1,6 +1,5 @@ # -*- encoding: binary -*- -class Raindrops -module Linux +module Raindrops::Linux # The standard proc path for active UNIX domain sockets, feel free to call # String#replace on this if your /proc is mounted in a non-standard location @@ -27,7 +26,7 @@ module Linux # This parses /proc/net/unix as there is no other (known) way # to expose Unix domain socket statistics over netlink. def unix_listener_stats(paths) - rv = Hash.new { |h,k| h[k.freeze] = ListenStats.new(0, 0) } + rv = Hash.new { |h,k| h[k.freeze] = Raindrops::ListenStats.new(0, 0) } paths = paths.map do |path| path = path.dup path.force_encoding(Encoding::BINARY) if defined?(Encoding) @@ -47,8 +46,6 @@ module Linux rv end - module_function :unix_listener_stats -end # Linux -end # Raindrops +end # Raindrops::Linux diff --git a/lib/raindrops/middleware.rb b/lib/raindrops/middleware.rb index f5cbb89..8ddac1f 100644 --- a/lib/raindrops/middleware.rb +++ b/lib/raindrops/middleware.rb @@ -3,8 +3,7 @@ require 'raindrops' # Raindrops middleware should be loaded at the top of Rack # middleware stack before other middlewares for maximum accuracy. -class Raindrops -class Middleware < ::Struct.new(:app, :stats, :path, :tcp, :unix) +class Raindrops::Middleware < Struct.new(:app, :stats, :path, :tcp, :unix) # :stopdoc: Stats = Raindrops::Struct.new(:calling, :writing) @@ -57,12 +56,12 @@ class Middleware < ::Struct.new(:app, :stats, :path, :tcp, :unix) body = "calling: #{stats.calling}\n" \ "writing: #{stats.writing}\n" - if defined?(Linux) - Linux.tcp_listener_stats(tcp).each do |addr,stats| + if defined?(Raindrops::Linux) + Raindrops::Linux.tcp_listener_stats(tcp).each do |addr,stats| body << "#{addr} active: #{stats.active}\n" \ "#{addr} queued: #{stats.queued}\n" end if tcp - Linux.unix_listener_stats(unix).each do |addr,stats| + Raindrops::Linux.unix_listener_stats(unix).each do |addr,stats| body << "#{addr} active: #{stats.active}\n" \ "#{addr} queued: #{stats.queued}\n" end if unix @@ -74,6 +73,4 @@ class Middleware < ::Struct.new(:app, :stats, :path, :tcp, :unix) } [ 200, headers, [ body ] ] end - -end end -- cgit v1.2.3-24-ge0c7