Use client for hostname when blank for rfc3164

Author: Xiol

server.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"net"
+	"strings"
 	"sync"
 	"time"
 
@@ -252,6 +253,13 @@ func (s *Server) parser(line []byte, client string, tlsPeer string) {
 
 	logParts := parser.Dump()
 	logParts["client"] = client
+	if logParts["hostname"] == "" && s.format == RFC3164 {
+		if i := strings.Index(client, ":"); i > 1 {
+			logParts["hostname"] = client[:i]
+		} else {
+			logParts["hostname"] = client
+		}
+	}
 	logParts["tls_peer"] = tlsPeer
 
 	s.handler.Handle(logParts, int64(len(line)), err)

server_test.go

@@ -18,6 +18,7 @@ type ServerSuite struct {
 
 var _ = Suite(&ServerSuite{})
 var exampleSyslog = "<31>Dec 26 05:08:46 hostname tag[296]: content"
+var exampleSyslogNoTSTagHost = "<14>INFO     leaving (1) step postscripts"
 var exampleRFC5424Syslog = "<34>1 2003-10-11T22:14:15.003Z mymachine.example.com su - ID47 - 'su root' failed for lonvick on /dev/pts/8"
 
 func (s *ServerSuite) TestTailFile(c *C) {
@@ -166,6 +167,23 @@ func (s *ServerSuite) TestUDP3164(c *C) {
 	c.Check(handler.LastError, IsNil)
 }
 
+func (s *ServerSuite) TestUDP3164NoTag(c *C) {
+	handler := new(HandlerMock)
+	server := NewServer()
+	server.SetFormat(RFC3164)
+	server.SetHandler(handler)
+	server.SetTimeout(10)
+	server.goParseDatagrams()
+	server.datagramChannel <- DatagramMessage{[]byte(exampleSyslogNoTSTagHost), "127.0.0.1:45789"}
+	close(server.datagramChannel)
+	server.Wait()
+	c.Check(handler.LastLogParts["hostname"], Equals, "127.0.0.1")
+	c.Check(handler.LastLogParts["tag"], Equals, "")
+	c.Check(handler.LastLogParts["content"], Equals, "INFO     leaving (1) step postscripts")
+	c.Check(handler.LastMessageLength, Equals, int64(len(exampleSyslogNoTSTagHost)))
+	c.Check(handler.LastError, IsNil)
+}
+
 func (s *ServerSuite) TestUDP6587(c *C) {
 	handler := new(HandlerMock)
 	server := NewServer()