This is the first version where mongrel and webrick are reliably startable and stoppable via Puppet::Network::Server.

Added a network/server integration spec, testing startup, shutdown, reachability, and collision of webrick and mongrel servers in the new network code.

Converted Puppet::Network::HTTP::Handler class to a module, as mongrel Handler should be subclassed; converting subclasses to include the module instead.

Mongrel will actually stop if you .stop it, graceful_shutdown didn't seem quite so reliable.

Webrick requires running in its own Thread to avoid hanging the entire process; this requires introduction of a Mutex to make things safe.

We're only supporting the REST protocol.  Made this explicit.

Fixed http server setup args, w/ specs, ah the glory of integration testing.

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/unit/network/http/mongrel.rb b/spec/unit/network/http/mongrel.rb
index a837c9daa..cd23ed9e1 100644
--- a/spec/unit/network/http/mongrel.rb
+++ b/spec/unit/network/http/mongrel.rb
@@ -106,13 +106,13 @@ describe Puppet::Network::HTTP::Mongrel, "when turning off listening" do
     
     it "should order mongrel server to stop" do
         @server.listen(@listen_params)
-        @mock_mongrel.expects(:graceful_shutdown)
+        @mock_mongrel.expects(:stop)
         @server.unlisten
     end
     
     it "should not be listening" do
         @server.listen(@listen_params)
-        @mock_mongrel.stubs(:graceful_shutdown)
+        @mock_mongrel.stubs(:stop)
         @server.unlisten
         @server.should_not be_listening
     end