Permalink
Browse files

Made gateway.cgi work with a ruby called anything

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1678 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 128e352 commit 1a7377a984ac850f74bfdad50c63f0c2c946f0a4 @dhh dhh committed Jul 4, 2005
Showing with 13 additions and 4 deletions.
  1. +5 −1 railties/bin/listener
  2. +5 −1 railties/bin/tracker
  3. +3 −2 railties/dispatches/gateway.cgi
View
@@ -2,6 +2,7 @@ require "drb"
ENV["RAILS_ENV"] = 'production'
require "#{File.dirname(__FILE__)}/../config/environment.rb"
require 'fcgi_handler'
+require 'rbconfig'
VERBOSE = false
@@ -90,7 +91,10 @@ if ARGV.shift == 'start-listeners'
if number > 1
fork do
- exec 'ruby', __FILE__, 'start-listeners', tracker, (number - 1).to_s
+ exec(
+ File.join(Config::CONFIG['bin_dir'], Config::CONFIG['RUBY_SO_NAME']),
+ __FILE__, 'start-listeners', tracker, (number - 1).to_s
+ )
end
end
View
@@ -1,4 +1,5 @@
require "drb"
+require "rbconfig"
VERBOSE = false
@@ -85,7 +86,10 @@ class Tracker
tracker_uri = @uri
listener_path = File.join(File.dirname(__FILE__), 'listener')
fork do
- exec 'ruby', listener_path, 'start-listeners', tracker_uri, n.to_s
+ exec(
+ File.join(Config::CONFIG['bin_dir'], Config::CONFIG['RUBY_SO_NAME']),
+ listener_path, 'start-listeners', tracker_uri, n.to_s
+ )
end
end
@@ -2,8 +2,9 @@
# This is an experimental feature for getting high-speed CGI by using a long-running, DRb-backed server in the background
-require File.join(File.dirname(__FILE__), 'drb')
+require 'drb'
require 'cgi'
+require 'rbconfig'
VERBOSE = false
@@ -19,7 +20,7 @@ def start_tracker
STDIN.reopen "/dev/null"
STDOUT.reopen "/dev/null", "a"
- exec 'ruby', tracker_path, 'start', ConnectionUri
+ exec(File.join(Config::CONFIG['bin_dir'], Config::CONFIG['RUBY_SO_NAME']), tracker_path, 'start', ConnectionUri)
end
$stderr.puts "dispatch: waiting for tracker to start..." if VERBOSE

0 comments on commit 1a7377a

Please sign in to comment.