racknga 0.9.3 → 0.9.4

data/lib/racknga/middleware/cache.rb

@@ -14,10 +14,11 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'digest'
 require 'yaml'
+require 'zlib'
 require 'racknga/cache_database'
 
 module Racknga
@@ -168,13 +169,15 @@ module Racknga
         now = Time.now
         headers = Rack::Utils::HeaderHash.new(headers)
         headers["Last-Modified"] ||= now.httpdate
-        stringified_body = ''
+        encoded_body = ''.force_encoding("ASCII-8BIT")
+        deflater = ::Zlib::Deflate.new
         body.each do |data|
-          stringified_body << data
+          encoded_body << deflater.deflate(data)
         end
+        body.close if body.respond_to?(:close)
+        encoded_body << deflater.finish
         headers = headers.to_hash
         encoded_headers = headers.to_yaml
-        encoded_body = stringified_body.force_encoding("ASCII-8BIT")
         cache[key] = {
           :status => status,
           :headers => encoded_headers,
@@ -183,7 +186,7 @@ module Racknga
           :age => age,
           :created_at => now,
         }
-        body = [stringified_body]
+        body = Inflater.new(encoded_body)
         log("store", request)
         [status, headers, body]
       end
@@ -199,7 +202,7 @@ module Racknga
         end
 
         log("hit", request)
-        [status, YAML.load(headers), [body]]
+        [status, YAML.load(headers), Inflater.new(body)]
       end
 
       def compute_checksum(status, encoded_headers, encoded_body)
@@ -227,6 +230,17 @@ module Racknga
         runtime = Time.now - start_time
         logger.log("cache-#{tag}", request.fullpath, :runtime => runtime)
       end
+
+      # @private
+      class Inflater
+        def initialize(deflated_string)
+          @deflated_string = deflated_string
+        end
+
+        def each
+          yield ::Zlib::Inflate.inflate(@deflated_string)
+        end
+      end
     end
   end
 end

data/lib/racknga/middleware/deflater.rb

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
   module Middleware

data/lib/racknga/middleware/exception_notifier.rb

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'racknga/exception_mail_notifier'
 

data/lib/racknga/middleware/instance_name.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2011  Ryo Onodera <onodera@clear-code.com>
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
   module Middleware
@@ -23,12 +24,18 @@ module Racknga
     # server when your Rack applications are deployed behind
     # load balancers.
     #
-    # Usage:
+    # @example A simple usage
     #   require "racknga"
     #   use Racknga::Middleware::InstanceName
     #   run YourApplication
     class InstanceName
       attr_reader :header
+      # @param [application] application rack application.
+      # @param [Hash] options options to create header.
+      # @option options [String] :header_name ("Responsed-By") header name.
+      # @option options [String] :application_name (application.class.name)
+      #   application name.
+      # @option options [Integer] :version application version.
       def initialize(application, options={})
         @application = application
         @options = options
@@ -57,7 +64,14 @@ module Racknga
       end
 
       def revision
-        `git describe --abbrev=7 HEAD`.strip # XXX be SCM-agonostic
+        case using_scm_name
+        when :git
+          `git describe --abbrev=7 HEAD`.strip
+        when :subversion
+          `LANG=C svn info | grep Revision`.strip
+        else
+          nil
+        end
       end
 
       def server
@@ -68,17 +82,15 @@ module Racknga
         `id --user --name`.strip
       end
 
-      CURRENT_BRANCH_MARKER = /\A\* /
       def branch
-        current_branch = nil
-        `git branch -a`.each_line do |line|
-          case line
-          when CURRENT_BRANCH_MARKER
-            current_branch = line.sub(CURRENT_BRANCH_MARKER, "").strip
-            break
-          end
+        case using_scm_name
+        when :git
+          git_branch_name
+        when :subversion
+          subversion_branch_name
+        else
+          nil
         end
-        current_branch
       end
 
       def ruby
@@ -159,6 +171,47 @@ module Racknga
           nil
         end
       end
+
+      SVN_URL_KEY = /\AURL:.*/
+      SVN_REPOSITORY_ROOT_KEY = /\ARepository Root:.*/
+      SVN_KEY = /\A.*:/
+      SVN_BRANCHES_NAME = /\A\/branches\//
+      def subversion_branch_name
+        url = ""
+        repository_root = ""
+
+        `LANG=C svn info`.each_line do |line|
+          case line
+          when SVN_URL_KEY
+            url = line.sub(SVN_KEY, "").strip
+          when SVN_REPOSITORY_ROOT_KEY
+            repository_root = line.sub(SVN_KEY, "").strip
+          end
+        end
+        base_path = url.sub(/#{Regexp.escape(repository_root)}/, "")
+        base_path.sub(SVN_BRANCHES_NAME, "")
+      end
+
+      GIT_CURRENT_BRANCH_MARKER = /\A\* /
+      def git_branch_name
+        `git branch -a`.each_line do |line|
+          case line
+          when GIT_CURRENT_BRANCH_MARKER
+            return line.sub(GIT_CURRENT_BRANCH_MARKER, "").strip
+          end
+        end
+        nil
+      end
+
+      def using_scm_name
+        if File.exist?(".git")
+          :git
+        elsif File.exist?(".svn")
+          :subversion
+        else
+          nil
+        end
+      end
     end
   end
 end

data/lib/racknga/middleware/jsonp.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2012  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
   module Middleware
@@ -91,7 +91,7 @@ module Racknga
         header_hash = Rack::Utils::HeaderHash.new(headers)
         return [status, headers, body] unless json_response?(header_hash)
         body = Writer.new(callback, body)
-        update_content_type(header_hash)
+        update_header_hash(header_hash, body)
         [status, header_hash, body]
       end
 
@@ -122,6 +122,11 @@ module Racknga
           media_type == "text/javascript"
       end
 
+      def update_header_hash(header_hash, body)
+        update_content_type(header_hash)
+        update_content_length(header_hash, body)
+      end
+
       def update_content_type(header_hash)
         content_type = header_hash["Content-Type"]
         media_type, parameters = content_type.split(/\s*;\s*/, 2)
@@ -132,17 +137,31 @@ module Racknga
         header_hash["Content-Type"] = updated_content_type
       end
 
+      def update_content_length(header_hash, body)
+        return unless header_hash["Content-Length"]
+
+        content_length = header_hash["Content-Length"].to_i
+        updated_content_length = content_length + body.additional_content_length
+        header_hash["Content-Length"] = updated_content_length.to_s
+      end
+
       # @private
       class Writer
         def initialize(callback, body)
           @callback = callback
           @body = body
+          @header = "#{@callback}("
+          @footer = ");"
         end
 
         def each(&block)
-          block.call("#{@callback}(")
+          block.call(@header)
           @body.each(&block)
-          block.call(");")
+          block.call(@footer)
+        end
+
+        def additional_content_length
+          @header.bytesize + @footer.bytesize
         end
       end
     end

data/lib/racknga/middleware/log.rb

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'racknga/log_database'
 

data/lib/racknga/middleware/nginx_raw_uri.rb

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
   module Middleware

data/lib/racknga/middleware/range.rb

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'time'
 

data/lib/racknga/reverse_line_reader.rb

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
   class ReverseLineReader

data/lib/racknga/utils.rb

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
   module Utils

data/lib/racknga/version.rb

@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Racknga
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/lib/racknga.rb

@@ -14,13 +14,14 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'rack'
 
 require 'racknga/version'
 require 'racknga/utils'
 require "racknga/access_log_parser"
+require 'racknga/api-keys'
 require 'racknga/middleware/deflater'
 require 'racknga/middleware/exception_notifier'
 require 'racknga/middleware/jsonp'

data/munin/plugins/passenger_application_

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2013  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,16 +23,11 @@ require 'rubygems'
 
 mode = ARGV[0]
 
-def passenger_status_path(gem_path)
-  File.join(gem_path, "bin", "passenger-status")
-end
-
 @label = ENV["label"]
 @pid_file = ENV["pid_file"]
 @ruby = ENV["ruby"] || Gem.ruby
-@gem_path = ((ENV["GEM_HOME"] || '').split(/:/) + Gem.path).find do |path|
-  File.exist?(passenger_status_path(path))
-end
+passenger_spec = Gem::Specification.find_by_name("passenger")
+@passenger_status = passenger_spec.bin_file("passenger-status")
 
 if @label
   parameter_prefix = /\Apassenger_(?:#{@label}_)?application_/
@@ -40,7 +35,7 @@ else
   parameter_prefix = /\Apassenger_application_/
 end
 parameter = File.basename($0).gsub(parameter_prefix, '')
-if /_(sessions|processed|uptime)\z/ =~ parameter
+if /_(\S+)\z/ =~ parameter
   @application = $PREMATCH
   @type = $1
   @application = nil if @application and @application.empty?
@@ -57,28 +52,25 @@ def passenger_status
   else
     pid = nil
   end
-  result = `#{@ruby} #{passenger_status_path(@gem_path)} #{pid}`
+  result = `#{@ruby} #{@passenger_status} #{pid}`
   [$?.success?, result]
 end
 
-def parse_uptime(uptime)
-  uptime_in_minutes = 0
-  if /\A(?:(?:(\d+)h\s+)?(\d+)m\s+)?(\d+)s\z/ =~ uptime
+def parse_time(time)
+  time_in_minutes = 0
+  if /\A(?:(?:(\d+)h\s+)?(\d+)m\s+)?(\d+)s\z/ =~ time
     hours = $1.to_i
     minutes = $2.to_i
     seconds = $3.to_i
-    uptime_in_minutes = minutes + hours * 60
+    time_in_minutes = minutes + hours * 60
   end
-  uptime_in_minutes
+  time_in_minutes
 end
 
 def extract_application_name(path)
   components = path.split(/\//)
-  ignore_components = ["current"]
-  while ignore_components.include?(components.last)
-    components.pop
-  end
-  components.pop
+  application_name, tag = components.last.split(/#/)
+  application_name
 end
 
 def parse_result(result)
@@ -86,34 +78,47 @@ def parse_result(result)
   section = nil
   application_name = nil
   result.each_line do |line|
-    case section
-    when "Application groups"
-      case line.chomp
-      when /\A(.+):\s*\z/
-        path = $1
-        application_name = extract_application_name(path)
-        sections[section] << [application_name, []]
-      when /\A\s+\*\s+
-              PID:\s+(\d+)\s+
-              Sessions:\s+(\d+)\s+
-              Processed:\s+(\d+)\s+
-              Uptime:\s+(.+)\z/x
-        pid = $1.to_i
-        sessions = $2.to_i
-        processed = $3.to_i
-        uptime = parse_uptime($4)
-        _application_name, processes = sections[section].last
-        processes << {
-          :pid => pid,
-          :sessions => sessions,
-          :processed => processed,
-          :uptime => uptime
-        }
-      end
+    case line
+    when /-+\s+(.+)\s+-+/
+      section = $1
+      sections[section] = []
     else
-      if /-+\s+(.+)\s+-+/ =~ line
-        section = $1
-        sections[section] = []
+      case section
+      when "Application groups"
+        case line.chomp
+        when /\A(\/.+):\s*\z/
+          path = $1
+          application_name = extract_application_name(path)
+          sections[section] << [application_name, []]
+        when /\A\s+\*\s+
+                PID:\s+(\d+)\s+
+                Sessions:\s+(\d+)\s+
+                Processed:\s+(\d+)\s+
+                Uptime:\s+(.+)\z/x
+          pid = $1.to_i
+          sessions = $2.to_i
+          processed = $3.to_i
+          uptime = parse_time($4)
+          _application_name, processes = sections[section].last
+          processes << {
+            :pid => pid,
+            :sessions => sessions,
+            :processed => processed,
+            :uptime => uptime
+          }
+        when /\A\s+
+                CPU:\s+(\d+)%\s+
+                Memory\s*:\s+(\d+)M\s+
+                Last\sused:\s+(.+)(?:\s+ago)\z/x
+          cpu = $1.to_i
+          memory = $2.to_i * 1024 * 1024
+          last_used = parse_time($3)
+          _application_name, processes = sections[section].last
+          process = processes.last
+          process[:cpu] = cpu
+          process[:memory] = memory
+          process[:last_used] = last_used
+        end
       end
     end
   end
@@ -138,6 +143,12 @@ def vlabel
     "number of processed sessions"
   when "uptime"
     "uptime by minutes"
+  when "cpu"
+    "CPU usage in percent"
+  when "memory"
+    "memory usage"
+  when "last_used"
+    "last used by minutes"
   else
     "unknown"
   end
@@ -219,6 +230,9 @@ when "suggest"
         puts "#{application}_sessions"
         puts "#{application}_processed"
         puts "#{application}_uptime"
+        puts "#{application}_cpu"
+        puts "#{application}_memory"
+        puts "#{application}_last_used"
       end
       exit(true)
     end

data/munin/plugins/passenger_status

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2013  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,16 +22,11 @@ require 'rubygems'
 
 mode = ARGV[0]
 
-def passenger_status_path(gem_path)
-  File.join(gem_path, "bin", "passenger-status")
-end
-
 @label = ENV["label"]
 @pid_file = ENV["pid_file"]
 @ruby = ENV["ruby"] || Gem.ruby
-@gem_path = ((ENV["GEM_HOME"] || '').split(/:/) + Gem.path).find do |path|
-  File.exist?(passenger_status_path(path))
-end
+passenger_spec = Gem::Specification.find_by_name("passenger")
+@passenger_status = passenger_spec.bin_file("passenger-status")
 
 def passenger_status
   if @pid_file
@@ -42,32 +37,60 @@ def passenger_status
   else
     pid = nil
   end
-  result = `#{@ruby} #{passenger_status_path(@gem_path)} #{pid}`
+  result = `#{@ruby} #{@passenger_status} #{pid}`
   [$?.success?, result]
 end
 
+def label_to_key(label)
+  label.downcase.gsub(/[ -]+/, "_")
+end
+
+def extract_application_name(path)
+  components = path.split(/\//)
+  application_name, tag = components.last.split(/#/)
+  application_name
+end
+
 def parse_result(result)
   sections = {}
   section = nil
   result.each_line do |line|
-    case section
-    when "General information"
-      case line.chomp
-      when /\A(\S+)\s*=\s*(\d+)\z/
-        key = $1
-        value = $2.to_i
-        sections[section] << {:key => key, :label => key, :value => value}
-      when /\A(Waiting on global queue):\s*(\d+)\z/
-        label = $1
-        value = $2.to_i
-        sections[section] << {:key => "global_queue",
-                              :label => label,
-                              :value => value}
-      end
+    case line
+    when /-+\s+(.+)\s+-+/
+      section = $1
+      sections[section] = []
     else
-      if /-+\s+(.+)\s+-+/ =~ line
-        section = $1
-        sections[section] = []
+      case section
+      when "General information"
+        case line.chomp
+        when /\A(.+):\s*(\d+)\z/
+          label = $1.strip
+          value = $2.to_i
+          key = label_to_key(label)
+          sections[section] << {
+            :key => key,
+            :label => label,
+            :value => value,
+          }
+        end
+      when "Application groups"
+        case line.chomp
+        when /\A(\/.+):\s*\z/
+          path = $1
+          application_name = extract_application_name(path)
+          sections[section] << [application_name, []]
+        when /\A\s+(.+):\s*(\d+)\z/
+          label = $1.strip
+          value = $2.to_i
+          _application_name, attributes = sections[section].last
+          key = "#{_application_name}_#{label_to_key(label)}"
+          label = "#{label}: #{_application_name}"
+          attributes << {
+            :key => key,
+            :label => label,
+            :value => value,
+          }
+        end
       end
     end
   end
@@ -95,12 +118,16 @@ graph_vlabel number of processes
 
 EOC
   have_stack_base = false
-  sections["General information"].each do |attributes|
-    key = attributes[:key]
+  attributes = sections["General information"]
+  sections["Application groups"].each do |_, application_attributes|
+    attributes += application_attributes
+  end
+  attributes.each do |attribute|
+    key = attribute[:key]
     next if key == "count"
-    puts("#{key}.label #{attributes[:label]}")
+    puts("#{key}.label #{attribute[:label]}")
     case key
-    when "max", "global_queue"
+    when /max/, /queue/
       draw = "LINE2"
     else
       if have_stack_base
@@ -110,7 +137,7 @@ EOC
         have_stack_base = true
       end
     end
-    puts("#{attributes[:key]}.draw #{draw}")
+    puts("#{attribute[:key]}.draw #{draw}")
   end
 end
 
@@ -119,8 +146,12 @@ def report
   exit(false) unless success
 
   sections = parse_result(result)
-  sections["General information"].each do |attributes|
-    puts("#{attributes[:key]}.value #{attributes[:value]}")
+  attributes = sections["General information"]
+  sections["Application groups"].each do |_, application_attributes|
+    attributes += application_attributes
+  end
+  attributes.each do |attribute|
+    puts("#{attribute[:key]}.value #{attribute[:value]}")
   end
 end