diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-23 19:06:29 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-23 19:06:29 -0500 |
| commit | ff9705914570158d1bad3073728a2e94ca4a0060 (patch) | |
| tree | f005f1ba130f66913f35a80c0f7d1eccd9f0bab5 /lib/puppet/network/http_server | |
| parent | 9b6e5013e387998936979d7a372acde3af65cf61 (diff) | |
| download | puppet-ff9705914570158d1bad3073728a2e94ca4a0060.tar.gz puppet-ff9705914570158d1bad3073728a2e94ca4a0060.tar.xz puppet-ff9705914570158d1bad3073728a2e94ca4a0060.zip | |
Somewhat refactored fileserving so that it no longer caches
any objects, nor does it use Puppet's RAL resources. In the
process, I fixed #894 (you can now copy links) and refactored
other classes as necessary. Mostly it was fixing tests.
This is a squashed commit of a temporary branch, fwiw,
and it also includes any fixes to the tests that were
necessary to get all tests passing again.
Diffstat (limited to 'lib/puppet/network/http_server')
| -rw-r--r-- | lib/puppet/network/http_server/webrick.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb index e4f00dd73..568b4e798 100644 --- a/lib/puppet/network/http_server/webrick.rb +++ b/lib/puppet/network/http_server/webrick.rb @@ -8,6 +8,7 @@ require 'puppet/sslcertificates/support' require 'puppet/network/xmlrpc/webrick_servlet' require 'puppet/network/http_server' require 'puppet/network/client' +require 'puppet/network/handler' module Puppet class ServerError < RuntimeError; end @@ -133,7 +134,7 @@ module Puppet handlers.collect { |handler, args| hclass = nil - unless hclass = Handler.handler(handler) + unless hclass = Puppet::Network::Handler.handler(handler) raise ServerError, "Invalid handler %s" % handler end hclass.new(args) |