Skip to content

Commit fc56a16

Browse files
committed
make fatcontext happy?
Signed-off-by: Etai Lev Ran <[email protected]>
1 parent 37986ed commit fc56a16

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

pkg/epp/datalayer/collector.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ type Collector struct {
7171
}
7272

7373
// NewCollector returns a new collector.
74-
func NewCollector() *Collector {
75-
return &Collector{}
74+
func NewCollector(ctx context.Context) *Collector {
75+
ctx, cancel := context.WithCancel(ctx)
76+
return &Collector{
77+
ctx: ctx,
78+
cancel: cancel,
79+
}
7680
}
7781

7882
// Start initiates data source collection for the endpoint.
79-
func (c *Collector) Start(ctx context.Context, tick Ticker, ep Endpoint, registry *DataSourceRegistry) {
80-
epCtx, cancel := context.WithCancel(ctx)
81-
83+
func (c *Collector) Start(tick Ticker, ep Endpoint, registry *DataSourceRegistry) {
8284
c.startOnce.Do(func() {
83-
c.ctx = epCtx
84-
c.cancel = cancel
8585
c.done = make(chan struct{})
8686
c.ticker = tick
8787
// c.wg.Add(1)
@@ -95,8 +95,6 @@ func (c *Collector) Start(ctx context.Context, tick Ticker, ep Endpoint, registr
9595

9696
for {
9797
select {
98-
case <-ctx.Done(): // global context cancelled (TODO: needed?)
99-
return
10098
case <-c.ctx.Done(): // per endpoint context cancelled
10199
return
102100
case <-c.done: // explicit stop signal
@@ -112,6 +110,7 @@ func (c *Collector) Start(ctx context.Context, tick Ticker, ep Endpoint, registr
112110
})
113111
}
114112

113+
// Stop terminates the collector
115114
func (c *Collector) Stop() {
116115
c.stopOnce.Do(func() {
117116
c.cancel()

0 commit comments

Comments
 (0)