Skip to content

Fix wait group waiting for server shutdown #17

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

Open
Taction wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix wait group waiting for server shutdown #17

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
6 changes: 3 additions & 3 deletions service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func makeAbortChan(done chan struct{}) chan struct{} {
return abortChan
}

func runComponent(socket string, opts *componentsOpts, abortChan chan struct{}, onFinish *sync.WaitGroup) error {
func runComponent(socket string, opts *componentsOpts, abortChan chan struct{}) error {
// remove socket if it is already created.
if err := os.Remove(socket); err != nil && !os.IsNotExist(err) {
return err
Expand All @@ -80,7 +80,6 @@ func runComponent(socket string, opts *componentsOpts, abortChan chan struct{},
return err
}
go func() {
defer onFinish.Done()
<-abortChan
lis.Close()
}()
Expand Down Expand Up @@ -109,11 +108,12 @@ func Run() error {
socket := filepath.Join(socketFolder, component+".sock")
cleanupGroup.Add(1)
go func(opts *componentsOpts) {
err := runComponent(socket, opts, abort, &cleanupGroup)
err := runComponent(socket, opts, abort)
if err != nil {
svcLogger.Errorf("aborting due to an error %v", err)
done <- struct{}{}
}
cleanupGroup.Done()
}(factories[component])
}

Expand Down