Support ltsv #363
+244
−23
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ package tailer | |
| import ( | ||
| "context" | ||
| "io" | ||
| "strings" | ||
|
|
||
| "github.com/mitchellh/mapstructure" | ||
| "github.com/nxadm/tail" | ||
|
|
@@ -66,6 +67,11 @@ type PatternTailer struct { | |
| gc *grok.CompiledGrok | ||
| } | ||
|
|
||
| type LTSVTailer struct { | ||
| handle *tail.Tail | ||
| ltsvParseString func(line string) map[string]string | ||
| } | ||
|
|
||
| func NewTailer(file string) (*Tailer, error) { | ||
| t, err := tail.TailFile(file, tailConfig) | ||
| if err != nil { | ||
|
|
@@ -95,6 +101,28 @@ func NewPatternTailer(file string, patterns map[string]string) (*PatternTailer, | |
| return &PatternTailer{t, gc}, nil | ||
| } | ||
|
|
||
| func NewLTSVTailer(file string) (*LTSVTailer, error) { | ||
| ltsvParseString := func(line string) map[string]string { | ||
| columns := strings.Split(line, "\t") | ||
| lvs := make(map[string]string) | ||
|
There was a problem hiding this comment. Not sure what lvs and lv mean. Could you give the variables more meaningful names? There was a problem hiding this comment. @dhurley Also Fix those name. |
||
| for _, column := range columns { | ||
| lv := strings.SplitN(column, ":", 2) | ||
| if len(lv) < 2 { | ||
| continue | ||
| } | ||
| label, value := strings.TrimSpace(lv[0]), strings.TrimSpace(lv[1]) | ||
| lvs[label] = value | ||
| } | ||
| return lvs | ||
| } | ||
| t, err := tail.TailFile(file, tailConfig) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return <SVTailer{t, ltsvParseString}, nil | ||
| } | ||
|
|
||
| func (t *Tailer) Tail(ctx context.Context, data chan<- string) { | ||
| for { | ||
| select { | ||
|
|
@@ -150,3 +178,32 @@ func (t *PatternTailer) Tail(ctx context.Context, data chan<- map[string]string) | |
| } | ||
| } | ||
| } | ||
|
|
||
| func (t *LTSVTailer) Tail(ctx context.Context, data chan<- map[string]string) { | ||
| for { | ||
| select { | ||
| case line := <-t.handle.Lines: | ||
| if line == nil { | ||
| return | ||
| } | ||
| if line.Err != nil { | ||
| continue | ||
| } | ||
|
|
||
| l := t.ltsvParseString(line.Text) | ||
| if l != nil { | ||
| data <- l | ||
| } | ||
| case <-ctx.Done(): | ||
| ctxErr := ctx.Err() | ||
| switch ctxErr { | ||
| case context.DeadlineExceeded: | ||
| log.Tracef("Tailer cancelled because deadline was exceeded, %v", ctxErr) | ||
| case context.Canceled: | ||
| log.Tracef("Tailer forcibly cancelled, %v", ctxErr) | ||
| } | ||
| log.Tracef("Tailer is done") | ||
| return | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you move this out into its own function?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dhurley I could move out the parse function outside.