Skip to content

Commit

Permalink
fix: properly handle http.ErrServerClosed (#234)
Browse files Browse the repository at this point in the history
* fix: properly handle http.ErrServerClosed

Logs API server: the server was ignoring ErrServerClosed and logging an error.

APM Data server: the server was using an equality check with the error message but
it was never satisfied because of a typo ('server closed' vs 'Server closed'), leading
to an error message.

Both servers are now handling the error and logging a message that the server stopped
successfully. The code is using go 1.13 errors to avoid comparing strings and for better
compatibility.

* refactor: reword error messages for better consistency

Co-authored-by: Marc Lopez Rubio <marc5.12@outlook.com>

Co-authored-by: Marc Lopez Rubio <marc5.12@outlook.com>
  • Loading branch information
kruskall and marclop authored Jul 18, 2022
1 parent 2057119 commit 20aa3c5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions apm-lambda-extension/extension/http_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package extension

import (
"context"
"errors"
"net"
"net/http"
"time"
Expand All @@ -45,12 +46,10 @@ func StartHttpServer(ctx context.Context, transport *ApmServerTransport) (agentD

go func() {
Log.Infof("Extension listening for apm data on %s", server.Addr)
if err = server.Serve(ln); err != nil {
if err.Error() == "http: server closed" {
Log.Debug(err)
} else {
Log.Errorf("Error upon APM data server start : %v", err)
}
if err = server.Serve(ln); err != nil && !errors.Is(err, http.ErrServerClosed) {
Log.Errorf("received error from http.Serve(): %v", err)
} else {
Log.Debug("server closed")
}
}()
return server, nil
Expand Down
2 changes: 1 addition & 1 deletion apm-lambda-extension/logsapi/subscribe.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func startHTTPServer(ctx context.Context, transport *LogsTransport) error {

go func() {
extension.Log.Infof("Extension listening for Lambda Logs API events on %s", transport.listener.Addr().String())
if err = transport.server.Serve(transport.listener); err != nil {
if err = transport.server.Serve(transport.listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
extension.Log.Errorf("Error upon Logs API server start : %v", err)
}
}()
Expand Down

0 comments on commit 20aa3c5

Please sign in to comment.