diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-26 04:44:25 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-10-26 04:44:25 +0000 |
| commit | 0ae5e3392597452acf6a2e9f0d4ac976b8ec9846 (patch) | |
| tree | e2307bce0ffacb9bf8ed54b0ebe84632b51fd9b8 /test/executables/puppetd.rb | |
| parent | 0d3db7984fd40769cbb29cde76e081cb06204710 (diff) | |
| download | puppet-0ae5e3392597452acf6a2e9f0d4ac976b8ec9846.tar.gz puppet-0ae5e3392597452acf6a2e9f0d4ac976b8ec9846.tar.xz puppet-0ae5e3392597452acf6a2e9f0d4ac976b8ec9846.zip | |
Adding logging methods to all Puppet::Element instances, and converting all instance log statements to use those methods. Additionally modified logging to take advantage of this by including the path of the logging object in the output. Logs will still need some cleanup to avoid duplicate information.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@731 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/executables/puppetd.rb')
| -rwxr-xr-x | test/executables/puppetd.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb index 72cf1f031..547405779 100755 --- a/test/executables/puppetd.rb +++ b/test/executables/puppetd.rb @@ -38,7 +38,8 @@ class TestPuppetDExe < Test::Unit::TestCase cmd += " --verbose" #cmd += " --fqdn %s" % fqdn cmd += " --port %s" % @@port - cmd += " --ssldir %s" % Puppet[:ssldir] + cmd += " --confdir %s" % Puppet[:puppetconf] + cmd += " --vardir %s" % Puppet[:puppetvar] cmd += " --server localhost" # and verify our daemon runs |