[Yum-devel] [PATCH 3/3] Make syslog_device configurable.

[Ville Skyttä]

---
 docs/yum.conf.5 |    6 ++++++
 yum/__init__.py |    7 +++++--
 yum/config.py   |    1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index a4789da..cb6f340 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -311,6 +311,12 @@ Identification (program name) for syslog messages.
 Facility name for syslog messages, see syslog(3).  Default is `LOG_USER'.
 
 .IP
+\fBsyslog_device \fR
+Where to log syslog messages. Can be a local device (path) or a host:port
+string to use a remote syslog.  If empty or points to a nonexistent device,
+syslog logging is disabled.  Default is `/dev/log'.
+
+.IP
 \fBproxy \fR
 URL to the proxy server that yum should use.
 
diff --git a/yum/__init__.py b/yum/__init__.py
index 0aaa819..7b84a61 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -102,7 +102,7 @@ class _YumPreBaseConf:
         self.enabled_plugins = None
         self.syslog_ident = None
         self.syslog_facility = None
-        self.syslog_device = '/dev/log'
+        self.syslog_device = None
         self.arch = None
         self.releasever = None
         self.uuid = None
@@ -270,12 +270,15 @@ class YumBase(depsolve.Depsolve):
             startupconf.syslog_ident = syslog_ident
         if syslog_facility != None:
             startupconf.syslog_facility = syslog_facility
+        if syslog_device != None:
+            startupconf.syslog_device = syslog_device
         if releasever != None:
             startupconf.releasever = releasever
 
         self.doLoggingSetup(startupconf.debuglevel, startupconf.errorlevel,
                             startupconf.syslog_ident,
-                            startupconf.syslog_facility, syslog_device)
+                            startupconf.syslog_facility,
+                            startupconf.syslog_device)
 
         if init_plugins and startupconf.plugins:
             self.doPluginSetup(optparser, plugin_types, startupconf.pluginpath,
diff --git a/yum/config.py b/yum/config.py
index cb01306..c82fabc 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -602,6 +602,7 @@ class StartupConf(BaseConfig):
     gaftonmode = BoolOption(False)
     syslog_ident = Option()
     syslog_facility = Option('LOG_USER')
+    syslog_device = Option('/dev/log')
     persistdir = Option('/var/lib/yum')
     
 class YumConf(StartupConf):
-- 
1.7.0.1