From 08b408b8f9e09613ee404088678702c4054e7a72 Mon Sep 17 00:00:00 2001
From: zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Thu, 9 Mar 2006 06:11:21 +0000
Subject: Slight mod to how mongrel/camping.rb works so that you can access the
 HttpServer (rather than acceptor thread).

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@90 19e92222-5c0b-0410-8929-a290d50e31e9
---
 examples/camping/blog.rb  | 2 +-
 examples/camping/tepee.rb | 4 ++--
 lib/mongrel.rb            | 2 --
 lib/mongrel/camping.rb    | 6 ++++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/camping/blog.rb b/examples/camping/blog.rb
index 0809f4f..c3a7ad6 100755
--- a/examples/camping/blog.rb
+++ b/examples/camping/blog.rb
@@ -281,5 +281,5 @@ if __FILE__ == $0
   server = Mongrel::Camping::start("0.0.0.0",3002,"/blog",Blog)
   puts "** Blog example is running at http://localhost:3002/blog"
   puts "** Default username is `admin', password is `camping'"
-  server.join
+  server.acceptor.join
 end
diff --git a/examples/camping/tepee.rb b/examples/camping/tepee.rb
index 6f3ef21..d162cf4 100644
--- a/examples/camping/tepee.rb
+++ b/examples/camping/tepee.rb
@@ -142,7 +142,7 @@ if __FILE__ == $0
   Tepee::Models::Base.threaded_connections=false
   Tepee.create
   
-  server = Mongrel::Camping::start("0.0.0.0",3001,"/tepee",Tepee)
+  server = Mongrel::Camping::start("0.0.0.0",3000,"/tepee",Tepee)
   puts "** Tepee example is running at http://localhost:3000/tepee"
-  server.join
+  server.acceptor.join
 end
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 067e136..92eff42 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -478,5 +478,3 @@ module Mongrel
   end
 
 end
-
-
diff --git a/lib/mongrel/camping.rb b/lib/mongrel/camping.rb
index 3a19960..d997a3b 100644
--- a/lib/mongrel/camping.rb
+++ b/lib/mongrel/camping.rb
@@ -49,14 +49,16 @@ module Mongrel
     # for your application on a given port and uri.  It's pretty
     # much all you need for a camping application to work right.
     #
-    # It returns the server thread which you should either
+    # It returns the Mongrel::HttpServer which you should either
     # join or somehow manage.  The thread is running when 
     # returned.
+
     def Camping.start(server, port, uri, klass)
       h = Mongrel::HttpServer.new(server, port)
       h.register(uri, CampingHandler.new(klass))
       h.register("/favicon.ico", Mongrel::Error404Handler.new(""))
-      return h.run
+      h.run
+      return h
     end
   end
 end
-- 
cgit v1.2.3-24-ge0c7