Refactored to use a Handler base class for server+protocol handlers. Finally eliminated dependency on Puppet.start, etc., from WEBrick HTTP server class. {webrick,mongrel}+REST now support request handling uniformly; need encode/decode next.

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
index 53aa2e99b..c4b2ed3c6 100644
--- a/lib/puppet/network/http/webrick.rb
+++ b/lib/puppet/network/http/webrick.rb
@@ -18,19 +18,14 @@ class Puppet::Network::HTTP::WEBrick
         @protocols = args[:protocols]
         @handlers = args[:handlers]        
         @server = WEBrick::HTTPServer.new(:BindAddress => args[:address], :Port => args[:port])
-        
         setup_handlers
-        
-        # TODO / FIXME is this really necessary? -- or can we do it in both mongrel and webrick?
-        Puppet.newservice(@server)
-        Puppet.start
-        
+        @server.start
         @listening = true
     end
     
     def unlisten
         raise "WEBrick server is not listening" unless listening?
-        shutdown
+        @server.shutdown
         @listening = false
     end