tomb doesn't need to be pointer

canonical · Jul 26, 2023 · c015637 · c015637
1 parent dc3ec38
commit c015637
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/internals/overlord/logstate/gatherer.go b/internals/overlord/logstate/gatherer.go
@@ -60,7 +60,7 @@ type logGatherer struct {
 	clientCancel context.CancelFunc
 
 	// tomb for the main loop
-	tomb *tomb.Tomb
+	tomb tomb.Tomb
 }
 
 func newLogGatherer(target *plan.LogTarget) (*logGatherer, error) {
@@ -75,7 +75,6 @@ func newLogGatherer(target *plan.LogTarget) (*logGatherer, error) {
 		client:     client,
 		entryCh:    make(chan servicelog.Entry),
 		pullers:    map[string]*logPuller{},
-		tomb:       &tomb.Tomb{},
 	}
 	g.clientCtx, g.clientCancel = context.WithCancel(context.Background())
 	g.tomb.Go(g.loop)
@@ -182,14 +181,13 @@ func (g *logGatherer) stop() {
 // main control loop.
 type logPuller struct {
 	iterator servicelog.Iterator
-	tomb     *tomb.Tomb
+	tomb     tomb.Tomb
 	entryCh  chan servicelog.Entry
 }
 
 func newLogPuller(entryCh chan servicelog.Entry, buffer *servicelog.RingBuffer) *logPuller {
 	p := &logPuller{
 		iterator: buffer.TailIterator(),
-		tomb:     &tomb.Tomb{},
 		entryCh:  entryCh,
 	}
 	p.tomb.Go(p.loop)