Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions cmd/mpcium/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,12 @@ func runNode(ctx context.Context, c *cli.Command) error {
go func() {
defer wg.Done()
if err := keygenConsumer.Run(appContext); err != nil {
logger.Error("error running keygen consumer", err)
errChan <- fmt.Errorf("keygen consumer error: %w", err)
if appContext.Err() != context.Canceled {
logger.Error("error running keygen consumer", err)
errChan <- fmt.Errorf("keygen consumer error: %w", err)
} else {
logger.Info("Keygen consumer finished successfully")
}
return
}
logger.Info("Keygen consumer finished successfully")
Expand All @@ -288,8 +292,12 @@ func runNode(ctx context.Context, c *cli.Command) error {
go func() {
defer wg.Done()
if err := signingConsumer.Run(appContext); err != nil {
logger.Error("error running signing consumer", err)
errChan <- fmt.Errorf("signing consumer error: %w", err)
if appContext.Err() != context.Canceled {
logger.Error("error running signing consumer", err)
errChan <- fmt.Errorf("signing consumer error: %w", err)
} else {
logger.Info("Signing consumer finished successfully")
}
return
}
logger.Info("Signing consumer finished successfully")
Expand Down
5 changes: 5 additions & 0 deletions pkg/eventconsumer/keygen_consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func (sc *keygenConsumer) waitForAllPeersReadyToGenKey(ctx context.Context) erro
select {
case <-ctx.Done():
if ctx.Err() == context.Canceled {
logger.Info("KeygenConsumer: Shutdown signal received during peer readiness wait")
return nil
}
return ctx.Err()
Expand Down Expand Up @@ -107,6 +108,10 @@ func (sc *keygenConsumer) Run(ctx context.Context) error {
sc.handleKeygenEvent,
)
if err != nil {
if ctx.Err() == context.Canceled {
logger.Info("KeygenConsumer: Shutdown during subscription setup")
return nil
}
return fmt.Errorf("failed to subscribe to keygen events: %w", err)
}
sc.jsSub = sub
Expand Down
5 changes: 5 additions & 0 deletions pkg/eventconsumer/sign_consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func (sc *signingConsumer) waitForSufficientPeers(ctx context.Context) error {
select {
case <-ctx.Done():
if ctx.Err() == context.Canceled {
logger.Info("SigningConsumer: Shutdown signal received during peer readiness wait")
return nil
}
return ctx.Err()
Expand Down Expand Up @@ -110,6 +111,10 @@ func (sc *signingConsumer) Run(ctx context.Context) error {
sc.handleSigningEvent,
)
if err != nil {
if ctx.Err() == context.Canceled {
logger.Info("SigningConsumer: Shutdown during subscription setup")
return nil
}
return fmt.Errorf("failed to subscribe to signing events: %w", err)
}
sc.jsSub = sub
Expand Down
Loading