Changeset 7708

Timestamp:

10/01/07 03:15:51 (1 year ago)

Author:

nzkoz

Message:

Add --prefix option to script/server when using mongrel. [dacat] Closes #9716

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/commands/process/spawner.rb (modified) (3 diffs)

trunk/railties/CHANGELOG

@@ -3 +3 @@
-* Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb [DHH]
-
+* Add --prefix option to script/server when using mongrel. [dacat]
-
-*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.1.4 - 1.2.3]

trunk/railties/lib/commands/process/spawner.rb

@@ -66 +66 @@
-      "-l #{OPTIONS[:rails_root]}/log/mongrel.log"
-
+    # Add prefix functionality to spawner's call to mongrel_rails
+    # Digging through monrel's project subversion server, the earliest
+    # Tag that has prefix implemented in the bin/mongrel_rails file
+    # is 0.3.15 which also happens to be the earilest tag listed.
+    # References: http://mongrel.rubyforge.org/svn/tags
+    if Mongrel::Const::MONGREL_VERSION.to_f >=0.3 && !OPTIONS[:prefix].nil?
+      cmd = cmd + " --prefix #{OPTIONS[:prefix]}"
+    end
-    system(cmd)
-  end
@@ -122 +130 @@
-  :address     => '0.0.0.0',
-  :instances   => 3,
-
+
+
-}
-
@@ -183 +192 @@
-  opts.on("-r", "--repeat=seconds",   Integer, "Repeat spawn attempts every n seconds (default: off)")             { |v| OPTIONS[:repeat] = v }
-  opts.on("-e", "--environment=name", String,  "test|development|production (default: #{OPTIONS[:environment]})")  { |v| OPTIONS[:environment] = v }
+  opts.on("-P", "--prefix=path",      String,  "URL prefix for Rails app. [Used only with Mongrel > v0.3.15]: (default: #{OPTIONS[:prefix]})")         { |v| OPTIONS[:prefix] = v }
-  opts.on("-n", "--process=name",     String,  "default: #{OPTIONS[:process]}")                                    { |v| OPTIONS[:process] = v }
-  opts.on("-s", "--spawner=path",     String,  "default: #{OPTIONS[:spawner]}")                                    { |v| OPTIONS[:spawner] = v }