racknga 0.9.2 → 0.9.4

data/lib/racknga/middleware/nginx_raw_uri.rb

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2011  Ryo Onodera <onodera@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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Racknga
+  module Middleware
+    # NOTE:
+    # This is a middleware that restores the unprocessed URI client requests
+    # as is. Usually, nginx-passenger stack unescapes percent encoding in URI
+    # and resolve relative paths (ie "." and "..").
+    # Most of time, processed URI isn't program. However, if you want to
+    # distinguish %2F (ie "/") from "/", it is.
+    #
+    # Passenger 3.x or later is required.
+    #
+    # Use this with following nginx configuration:
+    #
+    #   ... {
+    #      ...
+    #      passenger_set_cgi_param HTTP_X_RAW_REQUEST_URI $request_uri;
+    #   }
+    #
+    # Usage:
+    #   require "racknga"
+    #   use Racknga::Middleware::NginxRawURI
+    #   run YourApplication
+    class NginxRawURI
+      RAW_REQUEST_URI_HEADER_NAME = "HTTP_X_RAW_REQUEST_URI"
+      def initialize(application)
+        @application = application
+      end
+
+      # For Rack.
+      def call(environment)
+        raw_uri = environment[RAW_REQUEST_URI_HEADER_NAME]
+
+        if raw_uri
+          restore_raw_uri(environment, raw_uri)
+        end
+
+        @application.call(environment)
+      end
+
+      private
+      def restore_raw_uri(environment, raw_uri)
+        environment["PATH_INFO"] = raw_uri.split("?").first
+        environment["REQUEST_URI"] = raw_uri
+      end
+    end
+  end
+end

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.2'
+  VERSION = '0.9.4'
 end

data/lib/racknga.rb

@@ -14,15 +14,17 @@
 #
 # 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/nginx_access_log_parser"
+require "racknga/access_log_parser"
+require 'racknga/api-keys'
 require 'racknga/middleware/deflater'
 require 'racknga/middleware/exception_notifier'
 require 'racknga/middleware/jsonp'
 require 'racknga/middleware/range'
 require "racknga/middleware/instance_name"
+require "racknga/middleware/nginx_raw_uri"

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
 

data/test/racknga-test-utils.rb

@@ -12,12 +12,13 @@
 #
 # 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 "test/unit/capybara"
 require 'json'
 
 require 'racknga'
+require 'racknga/middleware/auth/api-key'
 require 'racknga/middleware/cache'
 require 'racknga/middleware/instance_name'
 

data/test/run-test.rb

@@ -14,12 +14,10 @@
 #
 # 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
 
 $VERBOSE = true
 
-$KCODE = "u" if RUBY_VERSION < "1.9"
-
 require 'pathname'
 
 base_dir = Pathname(__FILE__).dirname.parent.expand_path