summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorPaul Berry <paul@puppetlabs.com>2010-11-30 11:09:20 -0800
committerPaul Berry <paul@puppetlabs.com>2010-11-30 11:09:20 -0800
commit8766efea906f57428ff175cae9355d4b03d499d9 (patch)
tree8246aaab6fe69a571979e5fec5cbf5399d9e8eee /lib/puppet
parent71ecad9904c8c48c023e90e5fbea5b26b180c9cf (diff)
downloadpuppet-8766efea906f57428ff175cae9355d4b03d499d9.tar.gz
puppet-8766efea906f57428ff175cae9355d4b03d499d9.tar.xz
puppet-8766efea906f57428ff175cae9355d4b03d499d9.zip
Maint: Make http handler code call the indirector through ".indirection"
In commit 71ecad9904c8c48c023e90e5fbea5b26b180c9cf we removed the delegation from model class to indirection for the "find", "search", "destroy", and "expire" methods. When we did this we neglected to modify http handler code to call the indirector directly. This patch makes the appropriate changes to http handler code.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/http/handler.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
index 82238aa0a..fbd7d195f 100644
--- a/lib/puppet/network/http/handler.rb
+++ b/lib/puppet/network/http/handler.rb
@@ -103,7 +103,7 @@ module Puppet::Network::HTTP::Handler
# Execute our find.
def do_find(indirection_name, key, params, request, response)
- unless result = model(indirection_name).find(key, params)
+ unless result = model(indirection_name).indirection.find(key, params)
Puppet.info("Could not find #{indirection_name} for '#{key}'")
return do_exception(response, "Could not find #{indirection_name} #{key}", 404)
end
@@ -120,7 +120,7 @@ module Puppet::Network::HTTP::Handler
# Execute our search.
def do_search(indirection_name, key, params, request, response)
model = self.model(indirection_name)
- result = model.search(key, params)
+ result = model.indirection.search(key, params)
if result.nil?
return do_exception(response, "Could not find instances in #{indirection_name} with '#{key}'", 404)
@@ -134,7 +134,7 @@ module Puppet::Network::HTTP::Handler
# Execute our destroy.
def do_destroy(indirection_name, key, params, request, response)
- result = model(indirection_name).destroy(key, params)
+ result = model(indirection_name).indirection.destroy(key, params)
return_yaml_response(response, result)
end