rack-statsd 0.1.1 → 0.2.0

data/lib/rack-statsd.rb

@@ -1,5 +1,5 @@
 module RackStatsD
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
   # Simple middleware to add a quick status URL for tools like Nagios.
   class RequestStatus
@@ -7,6 +7,7 @@ module RackStatsD
     GET            = 'GET'.freeze
     PATH_INFO      = 'PATH_INFO'.freeze
     STATUS_PATH    = '/status'
+    HEADERS        = {"Content-Type" => "text/plain"}.freeze
 
     # Initializes the middleware.
     #
@@ -39,8 +40,11 @@ module RackStatsD
     def call(env)
       if env[REQUEST_METHOD] == GET
         if env[PATH_INFO] == @status_path
-          method = @callback.respond_to?(:call) ? :call : :to_s
-          return [200, {}, @callback.send(method)]
+          if @callback.respond_to?(:call)
+            return @callback.call
+          else
+            return [200, HEADERS, [@callback.to_s]]
+          end
         end
       end
 
@@ -63,13 +67,13 @@ module RackStatsD
     # Returns nothing.
     def initialize(app, options = {})
       @app = app
-      @host = options[:host] || `hostname -s`.chomp
+      @host = options.key?(:host) ? options[:host] : `hostname -s`.chomp
       @sha = options[:revision] || '<none>'
     end
 
     def call(env)
       status, headers, body = @app.call(env)
-      headers['X-Node'] = @host
+      headers['X-Node'] = @host if @host
       headers['X-Revision'] = @sha
       [status, headers, body]
     end
@@ -82,6 +86,9 @@ module RackStatsD
   # NOTE This middleware is not thread safe. It should only be used when
   # rack.multiprocess is true and rack.multithread is false.
   class ProcessUtilization
+    REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+    VALID_METHODS = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE'].freeze
+
     # Initializes the middleware.
     #
     # app      - The next Rack app in the pipeline.
@@ -210,7 +217,7 @@ module RackStatsD
 
     # called immediately after a request to record statistics, update the
     # procline, and dump information to the logfile
-    def record_request(status)
+    def record_request(status, env)
       now = Time.now
       diff = (now - @start)
       @active_time += diff
@@ -220,6 +227,11 @@ module RackStatsD
 
       if @stats
         @stats.timing("#{@stats_prefix}.response_time", diff * 1000)
+        if VALID_METHODS.include?(env[REQUEST_METHOD])
+          stat = "#{@stats_prefix}.response_time.#{env[REQUEST_METHOD].downcase}"
+          @stats.timing(stat, diff * 1000)
+        end
+
         if suffix = status_suffix(status)
           @stats.increment "#{@stats_prefix}.status_code.#{status_suffix(status)}"
         end
@@ -236,12 +248,26 @@ module RackStatsD
 
     def status_suffix(status)
       suffix = case status.to_i
+        when 200 then :ok
+        when 201 then :created
+        when 202 then :accepted
+        when 301 then :moved_permanently
+        when 302 then :found
+        when 303 then :see_other
+        when 304 then :not_modified
+        when 305 then :use_proxy
+        when 307 then :temporary_redirect
         when 400 then :bad_request
         when 401 then :unauthorized
+        when 402 then :payment_required
+        when 403 then :forbidden
         when 404 then :missing
+        when 410 then :gone
         when 422 then :invalid
-        when 503 then :node_down
         when 500 then :error
+        when 502 then :bad_gateway
+        when 503 then :node_down
+        when 504 then :gateway_timeout
       end
     end
 
@@ -279,7 +305,7 @@ module RackStatsD
       env.delete('HTTP_X_REQUEST_START')
 
       status, headers, body = @app.call(env)
-      body = Body.new(body) { record_request(status) }
+      body = Body.new(body) { record_request(status, env) }
       [status, headers, body]
     end
   end

data/rack-statsd.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'rack-statsd'
-  s.version           = '0.1.1'
-  s.date              = '2011-12-14'
+  s.version           = '0.2.0'
+  s.date              = '2013-01-24'
   s.rubyforge_project = 'rack-statsd'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,61 +1,85 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-statsd
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Ryan Tomayko
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-24 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &70288897702740 !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: :development
-  prerelease: false
-  version_requirements: *70288897702740
+  version_requirements: *id001
 description: Tools for monitoring Rack apps in production.
 email: technoweenie@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - LICENSE
 - README.md
 - Rakefile
 - lib/rack-statsd.rb
 - rack-statsd.gemspec
+has_rdoc: true
 homepage: https://github.com/github/rack-statsd
 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: rack-statsd
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: Tools for monitoring Rack apps in production.
 test_files: []
+