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

Shutdown correctly if the extension is short lived #120

Merged
merged 1 commit into from
Nov 30, 2023
+5 −3
Merged

Shutdown correctly if the extension is short lived #120

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
8 changes: 5 additions & 3 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ func (s *ExtensionManagerServer) Start() error {
err := func() error {
s.mutex.Lock()
defer s.mutex.Unlock()
// check after the lock the serverClient is present. It could have gone away on very short restart loops
if s.serverClient == nil {
return errors.New("cannot start, shutdown in progress")
}
registry := s.genRegistry()

stat, err := s.serverClient.RegisterExtension(
Expand Down Expand Up @@ -278,9 +282,7 @@ func (s *ExtensionManagerServer) Run() error {
}()

err := <-errc
if err := s.Shutdown(context.Background()); err != nil {
return err
}
_ = s.Shutdown(context.Background())
return err
}

Expand Down