ajp-rails 0.0.2 → 0.0.3

data/NEWS.en

@@ -1,6 +1,9 @@
 = NEWS
+== 0.0.3 (2006-01-25)
+ * The `0.3th' release.
+ * Sticky session support.
 == 0.0.2 (2006-01-24)
 Status: unstable
  * The `0th' release to be reviewed by "2nd Rails Meeting @ Tokyo".
- * The first release will be done in the last week of Jan, 2006. This
-   will be include the result of the review.
+ * The first release -- v.0.1.0 -- will be done by the end of Jan, 2006.
+   This will be include the result of the review.

data/NEWS.ja

@@ -1,6 +1,9 @@
 = NEWS
+== 0.0.3 (2006-01-25)
+ * ����äȽ���`��0.3��'��꡼��
+ * Sticky session�򥵥ݡ���
 == 0.0.2 (2006-01-24)
 ����: �԰���
  * Rails�ٶ���@����ǥ�ӥ塼���Ƥ�餦����ˡ�`������'��꡼����
- * ����꡼����2006ǯ1��ǽ����Τ����ˤ���ͽ�ꡣ��ӥ塼���Ƥ��ä�
+ * ����꡼��(0.1.0)��2006ǯ1��ǽ����Τ����ˤ���ͽ�ꡣ��ӥ塼���Ƥ��ä�
    ��̤�ȿ�Ǥ�����������

data/ajp-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "ajp-rails"
-  spec.version = "0.0.2"
+  spec.version = "0.0.3"
   spec.required_ruby_version = ">= 1.8.3"
   spec.add_dependency('ruby-ajp', '>= 0.2.0')
   spec.add_dependency('rails', '>= 0.14')

data/lib/ajp-rails/ajp_rails_dispatcher.rb

@@ -14,7 +14,20 @@ class AjpRailsDispatcher < Dispatcher
       request = AjpRailsRequest.new(ajp_req, session_options, server_environments)
       response = AjpRailsResponse.new
       prepare_application
-      ActionController::Routing::Routes.recognize!(request).process(request, response).to_ajp_response(ajp_req.output_cookies)
+      ActionController::Routing::Routes.recognize!(request).process(request, response)
+      ajp_req.output_cookies.each do |cookie|
+        if cookie.name == 'JSESSIONID'
+	  case cookie.value
+	  when String
+	    cookie.value << '.' << server_environments['LOAD_BALANCE_ID']
+	  when Array
+	    cookie.value.each do |item|
+	      item << '.' << server_environments['LOAD_BALANCE_ID']
+	    end
+	  end
+	end
+      end
+      response.to_ajp_response(ajp_req.output_cookies)
     rescue Object => exception
       puts exception.message + ":" + exception.backtrace.join("\n")
       failsafe_response(500) do

data/lib/ajp-rails/rails-runner.rb

@@ -50,6 +50,8 @@ OPTION_NAMES_TO_INTERNAL_NAMES = {
   'directory' => 'APP_DIRECTORY',
   'prefix' => 'DISPATCHER_PREFIX',
   'suffix' => 'DISPATCHER_SUFFIX',
+  'jvm-route' => 'LOAD_BALANCE_ID',
+  'serverid' => 'LOAD_BALANCE_ID',
   'daemon' => 'IS_DAEMON'
 }
 
@@ -105,6 +107,20 @@ def parse_options
             "The suffix of the ajp-mounted URLs.") { |v|
     cmd_opts[OPTION_NAMES_TO_INTERNAL_NAMES['suffix']] = v
   }
+  parser.on('--serverid=ID',
+            "The unique ID to identify this rails process," +
+	    " which is for sticky session. The ID can contain only" +
+	    " [a-z][A-Z][0-9], and case insensitive.") { |id|
+    raise ArgumentError, 'Server ID can contain only [a-z][A-Z][0-9].' unless
+      /\A[[:alnum:]]+\Z/ =~ id
+    cmd_opts[OPTION_NAMES_TO_INTERNAL_NAMES['serverid']] = id
+  }
+  parser.on('--jvm-route=ID',
+            "This is equal to --serverid") { |id|
+    raise ArgumentError, 'Server ID can contain only [a-z][A-Z][0-9].' unless
+      /\A[[:alnum:]]+\Z/ =~ id
+    cmd_opts[OPTION_NAMES_TO_INTERNAL_NAMES['jvm-route']] = id
+  }
   parser.on('--daemon', "Makes Rails run as a daemon") {|v|
     cmd_opts[OPTION_NAMES_TO_INTERNAL_NAMES['daemon']] = v
   }

data/lib/ajp-rails/rails-wrapper.rb

@@ -80,6 +80,20 @@ class AjpRailsRequest < ActionController::AbstractRequest
     @server_environments = server_environments
     @session_options['session_path'] ||= @server_environments['APP_LOCATION']
 
+    if server_environments['LOAD_BALANCE_ID'] and @req.cookies['JSESSIONID']
+      balance_id = server_environments['LOAD_BALANCE_ID']
+      @req.cookies['JSESSIONID'].each do |value|
+        case value
+	when String
+	  value.gsub!(/\.#{Regexp.escape(balance_id)}\Z/, '')
+	when Array
+	  value.each do |entry|
+            entry.gsub!(/\.#{Regexp.escape(balance_id)}\Z/, '')
+	  end
+	end
+      end
+    end
+
     # simulates environment hash.
     @env = self.class.instance_method(:environment).bind(self)
     # Object#method is overridden by AbstractRequest#method

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajp-rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-01-24 00:00:00 +09:00
+  version: 0.0.3
+date: 2006-01-25 00:00:00 +09:00
 summary: Ruby on Rails Runner, which uses AJP(Apache JServ Protocol) to cooperate with a HTTPd, instead of CGI or FastCGI
 require_paths: 
 - lib