Adding configurability to the syslog facility, using the "logfacility" parameter.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1724 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/puppet.rb b/lib/puppet.rb
index b4376108c..13e39d503 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -106,6 +106,9 @@ module Puppet
 
     self.setdefaults(:puppet,
         :trace => [false, "Whether to print stack traces on some errors"],
+        :logfacility => ["daemon", "What syslog facility to use when logging to syslog.
+            Syslog has a fixed list of valid facilities, and you must choose one of
+            those; you cannot just make one up."],
         :statedir => { :default => "$vardir/state",
             :mode => 01777,
             :desc => "The directory where Puppet state is stored.  Generally,
diff --git a/lib/puppet/log.rb b/lib/puppet/log.rb
index ee825e406..b99108172 100644
--- a/lib/puppet/log.rb
+++ b/lib/puppet/log.rb
@@ -181,7 +181,12 @@ module Puppet
                 options = Syslog::LOG_PID | Syslog::LOG_NDELAY
 
                 # XXX This should really be configurable.
-                facility = Syslog::LOG_DAEMON
+                str = Puppet[:logfacility]
+                begin
+                    facility = Syslog.const_get("LOG_#{str.upcase}")
+                rescue NameError
+                    raise Puppet::Error, "Invalid syslog facility %s" % str
+                end
 
                 @syslog = Syslog.open(name, options, facility)
             end