Skip to content

fix: properly handle http.ErrServerClosed #234

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
merged 2 commits into from
Jul 18, 2022
Merged

fix: properly handle http.ErrServerClosed #234

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302140a
fix: properly handle http.ErrServerClosed
kruskall Jul 14, 2022
a0fe920
refactor: reword error messages for better consistency
kruskall Jul 18, 2022
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
11 changes: 5 additions & 6 deletions apm-lambda-extension/extension/http_server.go
View file
Open in desktop
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("Error upon APM data server start : %v", err)
} else {
Log.Debug("Server closed correctly")
}
}()
return server, nil
Expand Down
2 changes: 1 addition & 1 deletion apm-lambda-extension/logsapi/subscribe.go
View file
Open in desktop
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