summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2012-01-28 09:03:57 +0000
committerEric Wong <normalperson@yhbt.net>2012-01-28 09:03:57 +0000
commit8478a54008ea64bf734b9dfc78d940ed69bc00ff (patch)
tree4b269ffde1cd90c3f708b565de552e807da157ba
parent49c70ae741b96588021eb1bb6327da4cf78f8ec0 (diff)
Ruby 2.0.0dev is the future and includes a CoW-friendly GC,
so we shall encourage folks to give Ruby 2.0.0dev a spin.
-rw-r--r--DESIGN6
-rw-r--r--examples/unicorn.conf.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/DESIGN b/DESIGN
index 2c98c2f..bff6a8b 100644
--- a/DESIGN
+++ b/DESIGN
@@ -31,9 +31,9 @@
 * One master process spawns and reaps worker processes.  The
   Rack application itself is called only within the worker process (but
   can be loaded within the master).  A copy-on-write friendly garbage
-  collector like Ruby Enterprise Edition can be used to minimize memory
-  usage along with the "preload_app true" directive (see
-  Unicorn::Configurator).
+  collector like the one found in Ruby 2.0.0dev or Ruby Enterprise Edition
+  can be used to minimize memory usage along with the "preload_app true"
+  directive (see Unicorn::Configurator).
 
 * The number of worker processes should be scaled to the number of
   CPUs, memory or even spindles you have.  If you have an existing
diff --git a/examples/unicorn.conf.rb b/examples/unicorn.conf.rb
index 61f0b4b..0238043 100644
--- a/examples/unicorn.conf.rb
+++ b/examples/unicorn.conf.rb
@@ -40,7 +40,7 @@ pid "/path/to/app/shared/pids/unicorn.pid"
 stderr_path "/path/to/app/shared/log/unicorn.stderr.log"
 stdout_path "/path/to/app/shared/log/unicorn.stdout.log"
 
-# combine REE with "preload_app true" for memory savings
+# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
 # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
 preload_app true
 GC.respond_to?(:copy_on_write_friendly=) and