@@ -45,16 +45,16 @@ module Thin # Start the backend and connect it. def start @stopping = false - # Allow for early run up of eventmachine. TODO : maybe move this into - # a method or proc to DRY. - if EventMachine.reactor_running? + starter = proc do connect @running = true + end + + # Allow for early run up of eventmachine. + if EventMachine.reactor_running? + starter.call else - EventMachine.run do - connect - @running = true - end + EventMachine.run(&starter) end end lib/thin/backends/base.rb @@ -169,7 +169,7 @@ EOS sorta_safe.size.should == nread parser.should be_finished - parser.should_not have_error + parser.should_not be_error end end spec/request/parser_spec.rb d2ac3ad7ba8b149b1a516eb8a5156b45b1b81471 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/528a99a94f5fccfedb03fee21b5958fc0f566e42 528a99a94f5fccfedb03fee21b5958fc0f566e42 2008-07-31T18:23:47-07:00 2008-07-31T18:23:47-07:00 DRY up Backend::Base#start. Fix weird spec failure caused by magic matcher: has_error => be_error f1841d1b4ede59b1f1c491eb9ae60e46a9780ed5 macournoyer macournoyer@gmail.com