Skip to content

chore: clean multiple errors handling #181

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

Merged
dunglas merged 1 commit into from
Aug 12, 2023
Merged

chore: clean multiple errors handling #181

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
13 changes: 7 additions & 6 deletions worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package frankenphp
import "C"
import (
"context"
"errors"
"fmt"
"net/http"
"path/filepath"
Expand Down Expand Up @@ -45,8 +46,8 @@ func startWorkers(fileName string, nbWorkers int) error {
workersReadyWG.Add(nbWorkers)

var (
m sync.RWMutex
errors []error
m sync.RWMutex
errs []error
)

l := getLogger()
Expand All @@ -68,7 +69,7 @@ func startWorkers(fileName string, nbWorkers int) error {
// TODO: this should never happen, maybe can we remove this block?
m.Lock()
defer m.Unlock()
errors = append(errors, fmt.Errorf("workers %q: unable to create main worker request: %w", absFileName, err))
errs = append(errs, fmt.Errorf("workers %q: unable to create main worker request: %w", absFileName, err))

return
}
Expand All @@ -77,7 +78,7 @@ func startWorkers(fileName string, nbWorkers int) error {
if err := ServeHTTP(nil, r); err != nil {
m.Lock()
defer m.Unlock()
errors = append(errors, fmt.Errorf("workers %q: unable to start: %w", absFileName, err))
errs = append(errs, fmt.Errorf("workers %q: unable to start: %w", absFileName, err))

return
}
Expand Down Expand Up @@ -107,12 +108,12 @@ func startWorkers(fileName string, nbWorkers int) error {
m.Lock()
defer m.Unlock()

if len(errors) == 0 {
if len(errs) == 0 {
return nil
}

// Wrapping multiple errors will be available in Go 1.20: https://github.com/golang/go/issues/53435
return fmt.Errorf("workers %q: error while starting: #%v", fileName, errors)
return fmt.Errorf("workers %q: error while starting: %w", fileName, errors.Join(errs...))
}

func stopWorkers() {
Expand Down