diff --git a/logparser/v5/main.go b/logparser/v5/main.go index e9abd48..19e102e 100644 --- a/logparser/v5/main.go +++ b/logparser/v5/main.go @@ -37,7 +37,7 @@ type logger struct { src pipe.Iterator } -func (l *logger) Digest(records pipe.Iterator) error { +func (l *logger) Consume(records pipe.Iterator) error { l.src = records return nil } diff --git a/logparser/v5/pipe/filter/filter.go b/logparser/v5/pipe/filter/filter.go index 7a9228f..ba26652 100644 --- a/logparser/v5/pipe/filter/filter.go +++ b/logparser/v5/pipe/filter/filter.go @@ -23,8 +23,8 @@ func By(fn ...Func) *Filter { return &Filter{filters: fn} } -// Digest saves the iterator for later processing. -func (f *Filter) Digest(records pipe.Iterator) error { +// Consume saves the iterator for later processing. +func (f *Filter) Consume(records pipe.Iterator) error { f.src = records return nil } diff --git a/logparser/v5/pipe/group/group.go b/logparser/v5/pipe/group/group.go index 4f342cd..5ce96ca 100644 --- a/logparser/v5/pipe/group/group.go +++ b/logparser/v5/pipe/group/group.go @@ -33,8 +33,8 @@ func By(key Func) *Group { } } -// Digest records for grouping. -func (g *Group) Digest(records pipe.Iterator) error { +// Consume records for grouping. +func (g *Group) Consume(records pipe.Iterator) error { return records.Each(func(r pipe.Record) { k := g.key(r) diff --git a/logparser/v5/pipe/pipe.go b/logparser/v5/pipe/pipe.go index 306055a..69b0101 100644 --- a/logparser/v5/pipe/pipe.go +++ b/logparser/v5/pipe/pipe.go @@ -12,15 +12,15 @@ type Iterator interface { Each(func(Record)) error } -// Digester represents a record consumer. -type Digester interface { - Digest(Iterator) error +// Consumer consumes records from an iterator. +type Consumer interface { + Consume(Iterator) error } // Transform represents both a record consumer and producer. // It has an input and output. // It takes a single record and provides an iterator for all the records. type Transform interface { - Digester // consumer + Consumer Iterator // producer } diff --git a/logparser/v5/pipe/pipeline.go b/logparser/v5/pipe/pipeline.go index afac6e2..4c93f6f 100644 --- a/logparser/v5/pipe/pipeline.go +++ b/logparser/v5/pipe/pipeline.go @@ -16,11 +16,11 @@ import ( type Pipeline struct { src Iterator trans []Transform - dst Digester + dst Consumer } // New creates a new pipeline. -func New(src Iterator, dst Digester, t ...Transform) *Pipeline { +func New(src Iterator, dst Consumer, t ...Transform) *Pipeline { return &Pipeline{ src: &logCount{Iterator: src}, dst: dst, @@ -38,11 +38,11 @@ func (p *Pipeline) Run() error { last := p.src for _, t := range p.trans { - if err := t.Digest(last); err != nil { + if err := t.Consume(last); err != nil { return err } last = t } - return p.dst.Digest(last) + return p.dst.Consume(last) } diff --git a/logparser/v5/pipe/report/chart.go b/logparser/v5/pipe/report/chart.go index 3322ef5..1302b93 100644 --- a/logparser/v5/pipe/report/chart.go +++ b/logparser/v5/pipe/report/chart.go @@ -17,8 +17,8 @@ func AsChart(w io.Writer) *Chart { return &Chart{w: w} } -// Digest generates a chart report. -func (c *Chart) Digest(records pipe.Iterator) error { +// Consume generates a chart report. +func (c *Chart) Consume(records pipe.Iterator) error { w := os.Stdout donut := chart.DonutChart{ diff --git a/logparser/v5/pipe/report/text.go b/logparser/v5/pipe/report/text.go index 0dbf20a..fc8cde1 100644 --- a/logparser/v5/pipe/report/text.go +++ b/logparser/v5/pipe/report/text.go @@ -32,8 +32,8 @@ func AsText(w io.Writer) *Text { return &Text{w: w} } -// Digest generates a text report. -func (t *Text) Digest(records pipe.Iterator) error { +// Consume generates a text report. +func (t *Text) Consume(records pipe.Iterator) error { w := tabwriter.NewWriter(t.w, minWidth, tabWidth, padding, ' ', flags) write := fmt.Fprintf