Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure block-generator service shutdown after failure. #937

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Ensure block-generator service shutdown after failure. #937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions cmd/block-generator/runner/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,23 @@ func (r *Args) run() error {
algodNet := fmt.Sprintf("localhost:%d", 11112)
indexerNet := fmt.Sprintf("localhost:%d", r.IndexerPort)
generatorShutdownFunc, generator := startGenerator(r.Path, algodNet, blockMiddleware)
defer func() {
// Shutdown generator.
if err := generatorShutdownFunc(); err != nil {
fmt.Printf("Failed to shutdown generator: %s\n", err)
}
}()

indexerShutdownFunc, err := startIndexer(logfile, r.LogLevel, r.IndexerBinary, algodNet, indexerNet, r.PostgresConnectionString, r.CPUProfilePath)
if err != nil {
return fmt.Errorf("failed to start indexer: %w", err)
}
defer func() {
// Shutdown indexer
if err := indexerShutdownFunc(); err != nil {
fmt.Printf("Failed to shutdown indexer: %s\n", err)
}
}()

// Create the report file
report, err := os.Create(reportfile)
Expand All @@ -118,16 +130,6 @@ func (r *Args) run() error {
}
}

// Shutdown generator.
if err := generatorShutdownFunc(); err != nil {
return err
}

// Shutdown indexer
if err := indexerShutdownFunc(); err != nil {
return err
}

return nil
}

Expand Down