From 52b306c5cd47e34644f7ec5f7ab100855929b618 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 4 May 2010 13:47:11 -0700 Subject: eventmachine: "rack.multithread" is always true when deferring Since deferred requests run in a separate thread, this affects the root (non-deferred) thread as well since it may share data with other threads. --- lib/rainbows/event_machine.rb | 8 ++++++++ t/app_deferred.ru | 1 + 2 files changed, 9 insertions(+) diff --git a/lib/rainbows/event_machine.rb b/lib/rainbows/event_machine.rb index 4b852c9..b19bdec 100644 --- a/lib/rainbows/event_machine.rb +++ b/lib/rainbows/event_machine.rb @@ -209,6 +209,14 @@ module Rainbows # This middleware is automatically loaded by Rainbows! when using # EventMachine and if the app responds to the +deferred?+ method. class TryDefer < Struct.new(:app) + + def initialize(app) + # the entire app becomes multithreaded, even the root (non-deferred) + # thread since any thread can share processes with others + Const::RACK_DEFAULTS['rack.multithread'] = true + super + end + def call(env) if app.deferred?(env) EM.defer(proc { catch(:async) { app.call(env) } }, diff --git a/t/app_deferred.ru b/t/app_deferred.ru index 179ac95..a70b33b 100644 --- a/t/app_deferred.ru +++ b/t/app_deferred.ru @@ -10,6 +10,7 @@ class DeferredApp < Struct.new(:app) end def call(env) + env["rack.multithread"] or raise RuntimeError, "rack.multithread not true" body = "#{Thread.current.inspect}\n" headers = { "Content-Type" => "text/plain", -- cgit v1.2.3-24-ge0c7