ud-replicated: only use /var/run/log if it's a socket

diff --git a/debian/changelog b/debian/changelog
index c1c2c9d..8326bfb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ userdir-ldap (0.3.83) UNRELEASED; urgency=low
     - make including keys for hosts optional (on by default)
     - support overriding the command we restrict to
     - sudopassword: allow dashes in hostnames.
+  * ud-replicated:
+    - only use /var/run/log if it's a socket.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 21 Sep 2014 15:20:05 +0200
+ -- Peter Palfrader <weasel@debian.org>  Fri, 05 Dec 2014 23:34:22 +0100
 
 userdir-ldap (0.3.82) unstable; urgency=low
 

diff --git a/ud-replicated b/ud-replicated
index 8bef0a5..747c334 100755 (executable)
--- a/ud-replicated
+++ b/ud-replicated
@@ -31,6 +31,7 @@ import logging.handlers
 import optparse
 import os
 import platform
+import stat
 import subprocess
 import sys
 import time
@@ -65,7 +66,7 @@ SFORMAT='ud-replicated[%(process)s]: %(message)s'
 logging.basicConfig(format=FORMAT, level=lvl)
 LOG = logging.getLogger(__name__)
 logsock = '/dev/log'
-if os.path.exists('/var/run/log'): # Kfreebsd randomly different
+if os.path.exists('/var/run/log') and stat.S_ISSOCK(os.stat('/var/run/log').st_mode): # Kfreebsd randomly different
     logsock = '/var/run/log'
 syslog_handler = logging.handlers.SysLogHandler(address = logsock)
 formatter = logging.Formatter(SFORMAT)