Mongrel interface changes

examples/mongrel.rb

@@ -9,4 +9,4 @@
 server.register '/', Mongrel::DirHandler.new(".")
 
 puts "Running on #{ADDR}:#{PORT}"
-server.run
+server.start

lib/revactor/mongrel.rb

@@ -29,8 +29,9 @@ def initialize(host, port, num_processors=950, throttle=0, timeout=60)
       @timeout = timeout
     end
 
-    # Runs the thing.  It returns the Actor the listener is running in.
-    def run
+    # Start Mongrel.  This method executes the Mongrel event loop, and will
+    # not return until interrupted or explicitly stopped.
+    def start
       begin
         while true
           begin
@@ -53,11 +54,16 @@ def run
         # STDERR.puts "#{Time.now}: Closed socket."
       end
     end
+
+    # Runs the thing.  Returns the Thread the server is running in.
+    def run
+      @acceptor = Thread.new { start }
+    end
 
     # Clean up after any dead workers
     def reap_dead_workers(reason = 'unknown')
       # FIXME This should signal all workers to die
       0
     end
   end
-end
+end