Skip to content

Commit

Permalink
Return error in case of failure to start HTTP server (#51)
Browse files Browse the repository at this point in the history
  • Loading branch information
streamer45 authored Jan 22, 2024
1 parent 79c931a commit 4413f3b
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
12 changes: 11 additions & 1 deletion service/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func (s *Server) Start() error {

s.log.Info("api: server is listening on " + s.listener.Addr().String())

startErrCh := make(chan error, 1)
go func() {
var err error
if s.cfg.TLS.Enable && s.cfg.TLS.CertFile != "" && s.cfg.TLS.CertKey != "" {
Expand All @@ -67,12 +68,21 @@ func (s *Server) Start() error {
s.log.Debug("api: serving plaintext")
err = s.srv.Serve(s.listener)
}

if err != nil && err != http.ErrServerClosed {
startErrCh <- err
s.log.Critical("error starting HTTP server", mlog.Err(err))
}
}()

return nil
// We wait for a second in order to return an error in case of failure to
// start the HTTP server.
select {
case err = <-startErrCh:
case <-time.After(time.Second):
}

return err
}

func (s *Server) Stop() error {
Expand Down
17 changes: 17 additions & 0 deletions service/api/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,23 @@ func TestStartServer(t *testing.T) {
require.Error(t, err)
})

t.Run("invalid certificate", func(t *testing.T) {
cfg := Config{
ListenAddress: ":0",
TLS: TLSConfig{
Enable: true,
CertFile: "../../testfiles/invalid_tls_test_cert.pem",
CertKey: "../../testfiles/tls_test_key.pem",
},
}
s, err := NewServer(cfg, log)
require.NoError(t, err)
require.NotNil(t, s)

err = s.Start()
require.EqualError(t, err, "open ../../testfiles/invalid_tls_test_cert.pem: no such file or directory")
})

t.Run("tls", func(t *testing.T) {
cfg := Config{
ListenAddress: ":0",
Expand Down

0 comments on commit 4413f3b

Please sign in to comment.