Commitf8f5e68

committed

fix: remove closed check when starting notification manager

1 parent628b81c commitf8f5e68Copy full SHA for f8f5e68

File tree

-10

lines changed

-10

lines changed

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ type Manager struct {`
`53`	`53`	`success,failurechandispatchResult`
`54`	`54`
`55`	`55`	`mu sync.Mutex// Protects following.`
`56`		`-closedbool`
`57`	`56`	`notifier*notifier`
`58`	`57`
`59`	`58`	`runOnce sync.Once`
`@@ -161,11 +160,6 @@ func (m *Manager) loop(ctx context.Context) error {`
`161`	`160`	`}()`
`162`	`161`
`163`	`162`	`m.mu.Lock()`
`164`		`-ifm.closed {`
`165`		`-m.mu.Unlock()`
`166`		`-returnxerrors.New("manager already closed")`
`167`		`-}`
`168`		`-`
`169`	`163`	`vareg errgroup.Group`
`170`	`164`
`171`	`165`	`m.notifier=newNotifier(ctx,m.cfg,uuid.New(),m.log,m.store,m.handlers,m.helpers,m.metrics,m.clock)`
`@@ -354,12 +348,13 @@ func (m *Manager) Stop(ctx context.Context) error {`
`354`	`348`	`m.mu.Lock()`
`355`	`349`	`deferm.mu.Unlock()`
`356`	`350`
`357`		`-ifm.closed {`
	`351`	`+m.log.Debug(context.Background(),"graceful stop requested")`
	`352`	`+`
	`353`	`+select {`
	`354`	`+case<-m.stop:`
`358`	`355`	`returnnil`
	`356`	`+default:`
`359`	`357`	`}`
`360`		`-m.closed=true`
`361`		`-`
`362`		`-m.log.Debug(context.Background(),"graceful stop requested")`
`363`	`358`
`364`	`359`	`// If the notifier hasn't been started, we don't need to wait for anything.`
`365`	`360`	`// This is only really during testing when we want to enqueue messages only but not deliver them.`

Comments

(0)