kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

avoid infinite loop on thin when running a modular application, fixes #369

Browse source
This commit is contained in:
Konstantin Haase 2011-10-04 16:37:19 -07:00
parent d6fb8cc067
commit 1d002390e3
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/sinatra/base.rb
View file

@ -247,10 +247,13 @@ module Sinatra
def self.defer(*) yield end def self.defer(*) yield end
def initialize(scheduler = self.class, keep_open = false, &back) def initialize(scheduler = self.class, keep_open = false, &back)
@back, @scheduler, @callbacks, @keep_open = back.to_proc, scheduler, [], keep_open @back, @scheduler, @keep_open = back.to_proc, scheduler, keep_open
@callbacks, @closed = [], false
end end
def close def close
return if @closed
@closed = true
@scheduler.schedule { @callbacks.each { |c| c.call }} @scheduler.schedule { @callbacks.each { |c| c.call }}
end end

5
test/streaming_test.rb
View file

@ -107,4 +107,9 @@ class StreamingTest < Test::Unit::TestCase
scheduler.defer! scheduler.defer!
assert_raise(RuntimeError) { scheduler.schedule! } assert_raise(RuntimeError) { scheduler.schedule! }
end end
it 'does not trigger an infinite loop if you call close in a callback' do
stream = Stream.new { |out| out.callback { out.close }}
stream.each { |str| }
end
end end