Skip to content
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

Jump to bottom

https: Small "defer" cleanup #471

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

https: Small "defer" cleanup #471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions fleetspeak/src/client/https/https.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,10 @@ func getFileIfModified(ctx context.Context, hosts []string, client *http.Client,
return nil, time.Time{}, fmt.Errorf("unable to retrieve file, last attempt failed with: %v", lastErr)
}

func getFileIfModifiedFromHost(ctx context.Context, host string, client *http.Client, service, name string, modSince time.Time, stats stats.CommunicatorCollector) (io.ReadCloser, time.Time, error) {
var didFetch bool
var err error
func getFileIfModifiedFromHost(ctx context.Context, host string, client *http.Client, service, name string, modSince time.Time, stats stats.CommunicatorCollector) (rc io.ReadCloser, t time.Time, gErr error) {
defer func() {
stats.AfterGetFileRequest(host, service, name, didFetch, err)
didFetch := rc != nil
stats.AfterGetFileRequest(host, service, name, didFetch, gErr)
}()

u := url.URL{
Expand All @@ -157,7 +156,7 @@ func getFileIfModifiedFromHost(ctx context.Context, host string, client *http.Cl
}

var req *http.Request
req, err = http.NewRequest("GET", u.String(), nil)
req, err := http.NewRequest("GET", u.String(), nil)
if err != nil {
return nil, time.Time{}, err
}
Expand All @@ -175,7 +174,6 @@ func getFileIfModifiedFromHost(ctx context.Context, host string, client *http.Cl

switch resp.StatusCode {
case http.StatusOK:
didFetch = true
modtime, err := http.ParseTime(resp.Header.Get("Last-Modified"))
if err != nil {
return resp.Body, time.Time{}, nil
Expand Down
Loading