diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-11-12 12:03:39 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-11-12 12:03:39 -0800 |
commit | e71a98deacd25bfaad5b80b0cd505e183933010c (patch) | |
tree | 261c29f5cd8059f259be6460d864be4edff51738 /examples | |
parent | a2c054810e035915d1e5ff27afd2b631de6ded0a (diff) | |
download | upr-e71a98deacd25bfaad5b80b0cd505e183933010c.tar.gz |
Revert "examples/rails_app-2.3.4: move middleware setup to config.ru"
This reverts commit 4770ea6d7a6eaf00cc19bc4fb2afd59071e8cf66.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/rails_app-2.3.4/config.ru | 15 | ||||
-rw-r--r-- | examples/rails_app-2.3.4/config/environment.rb | 10 |
2 files changed, 5 insertions, 20 deletions
diff --git a/examples/rails_app-2.3.4/config.ru b/examples/rails_app-2.3.4/config.ru index dcd7fb5..d51b6b2 100644 --- a/examples/rails_app-2.3.4/config.ru +++ b/examples/rails_app-2.3.4/config.ru @@ -1,14 +1,3 @@ require 'config/environment' -# upr defaults to using a Moneta::Memory backend which is good enough -# for single-process/server applications -$upr = Upr::Monitor.new - -map "/" do - use Rack::Chunked - use Rack::ContentLength - use Rack::Deflater - - use Upr, :backend => $upr, :frequency => 1 - use Rails::Rack::Static - run ActionController::Dispatcher.new -end +use Rails::Rack::Static +run ActionController::Dispatcher.new diff --git a/examples/rails_app-2.3.4/config/environment.rb b/examples/rails_app-2.3.4/config/environment.rb index f2670b8..c323778 100644 --- a/examples/rails_app-2.3.4/config/environment.rb +++ b/examples/rails_app-2.3.4/config/environment.rb @@ -25,12 +25,8 @@ Rails::Initializer.run do |config| # We MUST insert Upr before any parsers that read the body # since we need to wrap all calls to "rack.input" - # It is usually easier to just load it in RAILS_ROOT/config.ru - # (which is what we did, but here is a commented example of using - # upr inside the Rails middleware stack): - # - # config.middleware.insert_before('ActionController::ParamsParser', - # 'Upr', + config.middleware.insert_before('ActionController::ParamsParser', + 'Upr', # The default is to use the Moneta::Memory store here. # This won't work right if you have multiple processes # serving your application, however. @@ -52,5 +48,5 @@ Rails::Initializer.run do |config| # :drb => 'druby://127.0.0.1:2999', # # Update at most once every second (default is every 3 seconds) - # :frequency => 1) + :frequency => 1) end |