From 04b08da9af0c450d645ab7389d1467308cfc2db8 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 4 Mar 2013 21:27:36 +0100 Subject: Imported Upstream version 1.1~hg20130304 --- src/pkg/log/syslog/syslog_unix.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/pkg/log/syslog/syslog_unix.go') diff --git a/src/pkg/log/syslog/syslog_unix.go b/src/pkg/log/syslog/syslog_unix.go index 46a164dd5..a0001ccae 100644 --- a/src/pkg/log/syslog/syslog_unix.go +++ b/src/pkg/log/syslog/syslog_unix.go @@ -14,18 +14,16 @@ import ( // unixSyslog opens a connection to the syslog daemon running on the // local machine using a Unix domain socket. -func unixSyslog() (conn serverConn, err error) { +func unixSyslog() (conn net.Conn, err error) { logTypes := []string{"unixgram", "unix"} logPaths := []string{"/dev/log", "/var/run/syslog"} - var raddr string for _, network := range logTypes { for _, path := range logPaths { - raddr = path - conn, err := net.Dial(network, raddr) + conn, err := net.Dial(network, path) if err != nil { continue } else { - return netConn{conn}, nil + return conn, nil } } } -- cgit v1.2.3