diff options
| -rwxr-xr-x | examples/camping/blog.rb | 2 | ||||
| -rw-r--r-- | examples/camping/tepee.rb | 4 | ||||
| -rw-r--r-- | lib/mongrel.rb | 2 | ||||
| -rw-r--r-- | 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 |