summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-03-15 14:16:09 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commite5a78009f6bd593e7e3957f0dadb470e623396dd (patch)
treef1d386962e4a7ef5b4e20347653e570dccd141bf /ext
parentf838389da0530201849958444dbbe60977935ad0 (diff)
downloadpuppet-e5a78009f6bd593e7e3957f0dadb470e623396dd.tar.gz
puppet-e5a78009f6bd593e7e3957f0dadb470e623396dd.tar.xz
puppet-e5a78009f6bd593e7e3957f0dadb470e623396dd.zip
Feature #3347 REST-ified FileBucket
FileBucket Files have been reimplemented as an indirector terminus so that they can be transmitted over REST. The old Network::Client.dipper has been replaced with a compatibility later in FileBucket::Dipper that uses the indirector to access filebucket termini. Slightly revised patch: * No longer allows nil contents in FileBucket outside of initialization * Uses File.exist? instead of the deprecated File.exists? * Tweaks JSON serialization and de-serialization to include "path" Deferred issues: * Feature #3371 "FileBucket should not keep files in memory". * Feature #3372 "Replace FileBucket Dipper with more idiomatic calls"
Diffstat (limited to 'ext')
-rwxr-xr-xext/nagios/naggen2
-rwxr-xr-xext/puppet-test2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/nagios/naggen b/ext/nagios/naggen
index 6ff09e260..a9e04c47a 100755
--- a/ext/nagios/naggen
+++ b/ext/nagios/naggen
@@ -178,7 +178,7 @@ class NagiosWriter
def initialize(nagios_type)
@nagios_type = nagios_type
- @bucket = Puppet::Network::Client.client(:Dipper).new(:Path => Puppet[:clientbucketdir])
+ @bucket = Puppet::FileBucket::Dipper.new(:Path => Puppet[:clientbucketdir])
end
def rails_resources
diff --git a/ext/puppet-test b/ext/puppet-test
index dbbde40c6..53333076f 100755
--- a/ext/puppet-test
+++ b/ext/puppet-test
@@ -286,7 +286,7 @@ end
Suite.new :filebucket, "Filebucket interactions" do
def prepare
require 'tempfile'
- @client = Puppet::Network::Client.dipper.new($args)
+ @client = Puppet::FileBucket::Dipper.new($args)
end
newtest :backup, "Backed up file" do