From 86bd83877017f91922c17e311058d1cc8fbd55f8 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Fri, 21 May 2010 15:37:51 +0200
Subject: Move syslog into a feature

---
 lib/puppet/feature/base.rb | 7 +++++--
 lib/puppet/util/log.rb     | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/puppet')

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'
 
-- 
cgit