Allow the --toggle-spin switch on process/reaper to be negated

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2049 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 3 insertions, 1 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index a980570de4..a82906d2dd 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Allow the --toggle-spin switch on process/reaper to be negated
+
 * Replace render_partial with render :partial in scaffold generator [Nicholas Seckar]
 
 * Make the rake tasks (like fresh_rails_without_docs_using_links) aware of switchtower
diff --git a/railties/bin/process/reaper b/railties/bin/process/reaper
index 409d3b3c50..819cd0d4d9 100755
--- a/railties/bin/process/reaper
+++ b/railties/bin/process/reaper
@@ -114,7 +114,7 @@ ARGV.options do |opts|
   opts.on("-a", "--action=name", "reload|graceful|kill (default: #{OPTIONS[:action]})", String)  { |OPTIONS[:action]| }
   opts.on("-d", "--dispatcher=path", "default: #{OPTIONS[:dispatcher]}", String)                 { |OPTIONS[:dispatcher]| }
   opts.on("-s", "--spinner=path", "default: #{OPTIONS[:spinner]}", String)                       { |OPTIONS[:spinner]| }
-  opts.on("-t", "--toggle-spin", "Whether to send a USR1 to the spinner before and after the reaping (default: true)") { |OPTIONS[:toggle_spin]| }
+  opts.on("-t", "--[no-]toggle-spin", "Whether to send a USR1 to the spinner before and after the reaping (default: true)") { |OPTIONS[:toggle_spin]| }
   opts.on("-n", "--nudge=url", "Should point to URL that's handled by the FCGI process", String) { |OPTIONS[:nudge]| }
   opts.on("-i", "--iterations=number", "One nudge per FCGI process running (default: #{OPTIONS[:iterations]})", Integer) { |OPTIONS[:iterations]| }