yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

Revert "GODT-2039: bridge monitors bridge-gui via its PID."

Browse Source 
This reverts commit 3b9a3aaad2.
This commit is contained in:
James Houlahan
2022-11-16 12:14:09 +01:00
parent debe87f2f5
commit 7cb9546d21
9 changed files with 9 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/frontend/grpc/service_methods.go
View File

@ -95,19 +95,15 @@ func (s *Service) GuiReady(ctx context.Context, _ *emptypb.Empty) (*emptypb.Empt
// Quit implement the Quit gRPC service call.
func (s *Service) Quit(ctx context.Context, empty *emptypb.Empty) (*emptypb.Empty, error) {
s.log.Debug("Quit")
s.quit()
return &emptypb.Empty{}, nil
return &emptypb.Empty{}, s.quit()
}
func (s *Service) quit() {
func (s *Service) quit() error {
// Windows is notably slow at Quitting. We do it in a goroutine to speed things up a bit.
go func() {
if s.parentPID >= 0 {
s.parentPIDDoneCh <- struct{}{}
}
var err error
if s.isStreamingEvents() {
if err := s.stopEventStream(); err != nil {
if err = s.stopEventStream(); err != nil {
s.log.WithError(err).Error("Quit failed.")
}
}
@ -115,6 +111,8 @@ func (s *Service) quit() {
// The following call is launched as a goroutine, as it will wait for current calls to end, including this one.
s.grpcServer.GracefulStop()
}()
return nil
}
// Restart implement the Restart gRPC service call.