Merge pull request #19 from eenblam/eenblam-fixes

Fix #16 & #17

Author: jeromer

rfc3164/rfc3164.go

@@ -7,15 +7,16 @@ import (
 )
 
 type Parser struct {
-	buff     []byte
-	cursor   int
-	l        int
-	priority syslogparser.Priority
-	version  int
-	header   header
-	message  rfc3164message
-	location *time.Location
-	hostname string
+	buff          []byte
+	cursor        int
+	l             int
+	priority      syslogparser.Priority
+	version       int
+	header        header
+	message       rfc3164message
+	location      *time.Location
+	hostname      string
+	ParsePriority bool
 }
 
 type header struct {
@@ -30,10 +31,11 @@ type rfc3164message struct {
 
 func NewParser(buff []byte) *Parser {
 	return &Parser{
-		buff:     buff,
-		cursor:   0,
-		l:        len(buff),
-		location: time.UTC,
+		buff:          buff,
+		cursor:        0,
+		l:             len(buff),
+		location:      time.UTC,
+		ParsePriority: true,
 	}
 }
 
@@ -46,9 +48,18 @@ func (p *Parser) Hostname(hostname string) {
 }
 
 func (p *Parser) Parse() error {
-	pri, err := p.parsePriority()
-	if err != nil {
-		return err
+	if p.ParsePriority {
+		pri, err := p.parsePriority()
+		if err != nil {
+			return err
+		}
+		p.priority = pri
+	} else {
+		p.priority = syslogparser.Priority{
+			0,
+			syslogparser.Facility{0},
+			syslogparser.Severity{0},
+		}
 	}
 
 	hdr, err := p.parseHeader()
@@ -65,7 +76,6 @@ func (p *Parser) Parse() error {
 		return err
 	}
 
-	p.priority = pri
 	p.version = syslogparser.NO_VERSION
 	p.header = hdr
 	p.message = msg
@@ -74,15 +84,18 @@ func (p *Parser) Parse() error {
 }
 
 func (p *Parser) Dump() syslogparser.LogParts {
-	return syslogparser.LogParts{
+	parts := syslogparser.LogParts{
 		"timestamp": p.header.timestamp,
 		"hostname":  p.header.hostname,
 		"tag":       p.message.tag,
 		"content":   p.message.content,
-		"priority":  p.priority.P,
-		"facility":  p.priority.F.Value,
-		"severity":  p.priority.S.Value,
 	}
+	if p.ParsePriority {
+		parts["priority"] = p.priority.P
+		parts["facility"] = p.priority.F.Value
+		parts["severity"] = p.priority.S.Value
+	}
+	return parts
 }
 
 func (p *Parser) parsePriority() (syslogparser.Priority, error) {

rfc3164/rfc3164_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jeromer/syslogparser"
-	. "launchpad.net/gocheck"
+	. "gopkg.in/check.v1"
 )
 
 // Hooks up gocheck into the gotest runner.
@@ -28,10 +28,11 @@ func (s *Rfc3164TestSuite) TestParser_Valid(c *C) {
 
 	p := NewParser(buff)
 	expectedP := &Parser{
-		buff:     buff,
-		cursor:   0,
-		l:        len(buff),
-		location: time.UTC,
+		buff:          buff,
+		cursor:        0,
+		l:             len(buff),
+		location:      time.UTC,
+		ParsePriority: true,
 	}
 
 	c.Assert(p, DeepEquals, expectedP)
@@ -55,6 +56,37 @@ func (s *Rfc3164TestSuite) TestParser_Valid(c *C) {
 	c.Assert(obtained, DeepEquals, expected)
 }
 
+func (s *Rfc3164TestSuite) TestParser_WithoutPriority(c *C) {
+	buff := []byte("Oct 11 22:14:15 mymachine very.large.syslog.message.tag: 'su root' failed for lonvick on /dev/pts/8")
+
+	p := NewParser(buff)
+	p.ParsePriority = false
+	expectedP := &Parser{
+		buff:          buff,
+		cursor:        0,
+		l:             len(buff),
+		location:      time.UTC,
+		ParsePriority: false,
+	}
+
+	c.Assert(p, DeepEquals, expectedP)
+
+	err := p.Parse()
+	c.Assert(err, IsNil)
+
+	now := time.Now()
+
+	obtained := p.Dump()
+	expected := syslogparser.LogParts{
+		"timestamp": time.Date(now.Year(), time.October, 11, 22, 14, 15, 0, time.UTC),
+		"hostname":  "mymachine",
+		"tag":       "very.large.syslog.message.tag",
+		"content":   "'su root' failed for lonvick on /dev/pts/8",
+	}
+
+	c.Assert(obtained, DeepEquals, expected)
+}
+
 func (s *Rfc3164TestSuite) TestParseWithout_Hostname(c *C) {
 	buff := []byte("<30>Jun 23 13:17:42 chronyd[1119]: Selected source 192.168.65.1")
 

rfc5424/rfc5424_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jeromer/syslogparser"
-	. "launchpad.net/gocheck"
+	. "gopkg.in/check.v1"
 )
 
 // Hooks up gocheck into the gotest runner.

syslogparser_test.go

@@ -1,7 +1,7 @@
 package syslogparser
 
 import (
-	. "launchpad.net/gocheck"
+	. "gopkg.in/check.v1"
 	"testing"
 )