Skip to content

Return errors when http/grpc servers exit. #92

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
bboreham merged 3 commits into from
Jul 27, 2018
Merged

Return errors when http/grpc servers exit. #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aa6a00
Return errors when http/grpc servers exit.
gouthamve Apr 2, 2018
b3bc646
Merge branch 'master' into log-errors
gouthamve Jul 25, 2018
c6f86fe
Remove sleep and make sure bind-address is free
gouthamve Jul 27, 2018
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
43 changes: 37 additions & 6 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,48 @@ func RegisterInstrumentation(router *mux.Router) {
router.PathPrefix("/debug/pprof").Handler(http.DefaultServeMux)
}

// Run the server; blocks until SIGTERM is received.
func (s *Server) Run() {
go s.httpServer.Serve(s.httpListener)
// Run the server; blocks until SIGTERM or an error is received.
func (s *Server) Run() error {
errChan := make(chan error)

// Wait for a signal
go func() {
s.handler.Loop()
select {
case errChan <- nil:
default:
}
}()

go func() {
err := s.httpServer.Serve(s.httpListener)
if err == http.ErrServerClosed {
err = nil
}

select {
case errChan <- err:
default:
}
}()

// Setup gRPC server
// for HTTP over gRPC, ensure we don't double-count the middleware
httpgrpc.RegisterHTTPServer(s.GRPC, httpgrpc_server.NewServer(s.HTTP))
go s.GRPC.Serve(s.grpcListener)

// Wait for a signal
s.handler.Loop()
go func() {
err := s.GRPC.Serve(s.grpcListener)
if err == grpc.ErrServerStopped {
err = nil
}

select {
case errChan <- err:
default:
}
}()

return <-errChan
}

// Stop unblocks Run().
Expand Down
37 changes: 37 additions & 0 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,40 @@ func TestErrorInstrumentationMiddleware(t *testing.T) {
"/server.FakeServer/Succeed": "success",
}, statuses)
}

func TestRunReturnsError(t *testing.T) {
cfg := Config{
HTTPListenPort: 9190,
GRPCListenPort: 9191,
}
t.Run("http", func(t *testing.T) {
cfg.MetricsNamespace = "testing_http"
srv, err := New(cfg)
require.NoError(t, err)

errChan := make(chan error, 1)
go func() {
errChan <- srv.Run()
}()

require.NoError(t, srv.httpListener.Close())
require.NotNil(t, <-errChan)

// So that address is freed for further tests.
srv.GRPC.Stop()
})

t.Run("grpc", func(t *testing.T) {
cfg.MetricsNamespace = "testing_grpc"
srv, err := New(cfg)
require.NoError(t, err)

errChan := make(chan error, 1)
go func() {
errChan <- srv.Run()
}()

require.NoError(t, srv.grpcListener.Close())
require.NotNil(t, <-errChan)
})
}