Skip to content

Update rfc3164 to accept custom timestamp formats. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update rfc3164 to accept custom timestamp formats. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions rfc3164/rfc3164.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
)

type Parser struct {
tsFmts []string
buff []byte
cursor int
l int
Expand All @@ -16,6 +17,13 @@ type Parser struct {
message rfc3164message
}

var (
DefaultTimestampFormats = []string{
"Jan 02 15:04:05",
"Jan 2 15:04:05",
}
)

type header struct {
timestamp time.Time
hostname string
Expand All @@ -27,7 +35,12 @@ type rfc3164message struct {
}

func NewParser(buff []byte) *Parser {
return NewParserWithTimestampFormats(buff, DefaultTimestampFormats)
}

func NewParserWithTimestampFormats(buff []byte, tsFmts []string) *Parser {
return &Parser{
tsFmts: tsFmts,
buff: buff,
cursor: 0,
l: len(buff),
Expand Down Expand Up @@ -123,13 +136,8 @@ func (p *Parser) parseTimestamp() (time.Time, error) {
var tsFmtLen int
var sub []byte

tsFmts := []string{
"Jan 02 15:04:05",
"Jan 2 15:04:05",
}

found := false
for _, tsFmt := range tsFmts {
for _, tsFmt := range p.tsFmts {
tsFmtLen = len(tsFmt)

if p.cursor+tsFmtLen > p.l {
Expand Down
15 changes: 14 additions & 1 deletion rfc3164/rfc3164_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func (s *Rfc3164TestSuite) TestParser_Valid(c *C) {

p := NewParser(buff)
expectedP := &Parser{
tsFmts: DefaultTimestampFormats,
buff: buff,
cursor: 0,
l: len(buff),
Expand Down Expand Up @@ -122,6 +123,14 @@ func (s *Rfc3164TestSuite) TestParseTimestamp_Valid(c *C) {
s.assertTimestamp(c, ts, buff, len(buff), nil)
}

func (s *Rfc3164TestSuite) TestParseTimestamp_ValidCustomFormat(c *C) {
buff := []byte("2014-10-11T22:14:15Z")
ts := time.Date(2014, time.October, 11, 22, 14, 15, 0, time.UTC)
tsFmts := []string{"2006-01-02T15:04:05Z"}

s.assertTimestampWithFormat(c, ts, buff, tsFmts, len(buff), nil)
}

func (s *Rfc3164TestSuite) TestParseTag_Pid(c *C) {
buff := []byte("apache2[10]:")
tag := "apache2"
Expand Down Expand Up @@ -230,7 +239,11 @@ func (s *Rfc3164TestSuite) BenchmarkParsemessage(c *C) {
}

func (s *Rfc3164TestSuite) assertTimestamp(c *C, ts time.Time, b []byte, expC int, e error) {
p := NewParser(b)
s.assertTimestampWithFormat(c, ts, b, DefaultTimestampFormats, expC, e)
}

func (s *Rfc3164TestSuite) assertTimestampWithFormat(c *C, ts time.Time, b []byte, expFmt []string, expC int, e error) {
p := NewParserWithTimestampFormats(b, expFmt)
obtained, err := p.parseTimestamp()
c.Assert(obtained, Equals, ts)
c.Assert(p.cursor, Equals, expC)
Expand Down