public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git
Search Repo:
fix evented mongrel to not go crazy
ezmobius (author)
Tue Mar 04 13:33:51 -0800 2008
commit  17fa804630498330f69f46765c4ef6a4f4eb405a
tree    61e05b8f14e95b14bd2866b4df35e9268960ae24
parent  bf38f7948cdcb9a05a1177604d80b87558777987
...
1
 
2
3
4
...
14
15
16
17
 
 
 
 
18
19
20
...
1
2
3
4
5
...
15
16
17
 
18
19
20
21
22
23
24
0
@@ -1,4 +1,5 @@
0
 require 'swiftcore/evented_mongrel'
0
+require 'merb-core/rack/handler/mongrel'
0
 module Merb
0
   module Rack
0
 
0
@@ -14,7 +15,10 @@
0
       # :app<String>>:: The application name.
0
       def self.start(opts={})
0
         Merb.logger.info("Using EventedMongrel adapter: #{opts.inspect}")
0
- super(opts)
0
+ Merb.logger.flush
0
+ server = ::Mongrel::HttpServer.new(opts[:host], opts[:port].to_i)
0
+ server.register('/', ::Merb::Rack::Handler::Mongrel.new(opts[:app]))
0
+ server.run.join
0
       end
0
     end
0
   end
...
15
16
17
18
 
19
20
21
...
15
16
17
 
18
19
20
21
0
@@ -15,7 +15,7 @@
0
       # :port<Fixnum>:: The port Mongrel should bind to.
0
       # :app<String>>:: The application name.
0
       def self.start(opts={})
0
- Merb.logger.info("Using Mongrel adapter") if self == Merb::Rack::Mongrel
0
+ Merb.logger.info("Using Mongrel adapter")
0
         Merb.logger.flush
0
         server = ::Mongrel::HttpServer.new(opts[:host], opts[:port])
0
         server.register('/', ::Merb::Rack::Handler::Mongrel.new(opts[:app]))
...
1
2
3
4
5
6
...
 
1
 
2
3
4
0
@@ -1,6 +1,4 @@
0
-require 'mongrel'
0
 require 'stringio'
0
-
0
 class Mongrel::HttpResponse
0
   NO_CLOSE_STATUS_FORMAT = "HTTP/1.1 %d %s\r\n".freeze
0
   def send_status_no_connection_close(content_length=@body.length)

Comments

    No one has commented yet.