diff options
| author | David Schmitt <david@dasz.at> | 2010-05-21 15:37:51 +0200 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 86bd83877017f91922c17e311058d1cc8fbd55f8 (patch) | |
| tree | 9a389c2553948936756647d099babfe9f3ee2944 /lib/puppet | |
| parent | fc92408b7702eb0258c32805b8c250d448ec5406 (diff) | |
| download | puppet-86bd83877017f91922c17e311058d1cc8fbd55f8.tar.gz puppet-86bd83877017f91922c17e311058d1cc8fbd55f8.tar.xz puppet-86bd83877017f91922c17e311058d1cc8fbd55f8.zip | |
Move syslog into a feature
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/feature/base.rb | 7 | ||||
| -rw-r--r-- | lib/puppet/util/log.rb | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb index a8fba34c4..8a21fd30f 100644 --- a/lib/puppet/feature/base.rb +++ b/lib/puppet/feature/base.rb @@ -32,10 +32,13 @@ Puppet.features.add(:rrd, :libs => ["RRDtool"]) # We have OpenSSL Puppet.features.add(:openssl, :libs => ["openssl"]) -# We can use POSIX user functions? The require returns false on Windows +# We have a syslog implementation +Puppet.features.add(:syslog, :libs => ["syslog"]) + +# We can use POSIX user functions Puppet.features.add(:posix) do require 'etc' - Etc.getpwuid(0) != nil + Etc.getpwuid(0) != nil && Puppet.features.syslog? end # We can use Win32 functions diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb index c64cbe5e3..ba23e120a 100644 --- a/lib/puppet/util/log.rb +++ b/lib/puppet/util/log.rb @@ -1,4 +1,3 @@ -require 'syslog' require 'puppet/util/tagging' require 'puppet/util/classgen' |