diff options
Diffstat (limited to 'lib/puppet/server')
| -rwxr-xr-x | lib/puppet/server/fileserver.rb | 6 | ||||
| -rwxr-xr-x | lib/puppet/server/logger.rb | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb index 92bc129ec..9130b3df5 100755 --- a/lib/puppet/server/fileserver.rb +++ b/lib/puppet/server/fileserver.rb @@ -28,8 +28,8 @@ class Server end obj = nil - unless obj = Puppet::Type::PFile[dir] - obj = Puppet::Type::PFile.create( + unless obj = Puppet.type(:file)[dir] + obj = Puppet.type(:file).create( :name => dir, :check => CHECKPARAMS ) @@ -87,7 +87,7 @@ class Server # Deal with ignore parameters. def handleignore(children, path, ignore) - ignore.each { |ignore| + ignore.value.each { |ignore| Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match| children.delete(File.basename(match)) } diff --git a/lib/puppet/server/logger.rb b/lib/puppet/server/logger.rb index 0ee2d75f0..d5feb0320 100755 --- a/lib/puppet/server/logger.rb +++ b/lib/puppet/server/logger.rb @@ -10,6 +10,11 @@ class Server # :nodoc: # accept a log message from a client, and route it accordingly def addlog(message, client = nil, clientip = nil) + unless message + raise Puppet::DevError, "Did not receive message" + end + + Puppet.info message.inspect # if the client is set, then we're not local if client begin @@ -22,6 +27,10 @@ class Server # :nodoc: end end + unless message + raise Puppet::DevError, "Could not resurrect message" + end + # Mark it as remote, so it's not sent to syslog message.remote = true |