Skip to content

Commit a0495b8

Browse files
author
Allenzhli
authored
Close res.Body (#168)
* fix goroutine leak Signed-off-by: allenzhli <[email protected]> * get rid of defer Signed-off-by: allenzhli <[email protected]>
1 parent 7b3afbd commit a0495b8

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

pkg/client/alerts.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,26 @@ func (r *CortexClient) CreateAlertmanagerConfig(ctx context.Context, cfg string,
2626
return err
2727
}
2828

29-
_, err = r.doRequest(alertmanagerAPIPath, "POST", payload)
30-
return err
29+
res, err := r.doRequest(alertmanagerAPIPath, "POST", payload)
30+
if err != nil {
31+
return err
32+
}
33+
34+
res.Body.Close()
35+
36+
return nil
3137
}
3238

3339
// DeleteAlermanagerConfig deletes the users alertmanagerconfig
3440
func (r *CortexClient) DeleteAlermanagerConfig(ctx context.Context) error {
35-
_, err := r.doRequest(alertmanagerAPIPath, "DELETE", nil)
36-
return err
41+
res, err := r.doRequest(alertmanagerAPIPath, "DELETE", nil)
42+
if err != nil {
43+
return err
44+
}
45+
46+
res.Body.Close()
47+
48+
return nil
3749
}
3850

3951
// GetAlertmanagerConfig retrieves a rule group

pkg/client/rules.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (r *CortexClient) CreateRuleGroup(ctx context.Context, namespace string, rg
2828
return err
2929
}
3030

31-
defer res.Body.Close()
31+
res.Body.Close()
3232

3333
return nil
3434
}
@@ -39,8 +39,14 @@ func (r *CortexClient) DeleteRuleGroup(ctx context.Context, namespace, groupName
3939
escapedGroupName := url.PathEscape(groupName)
4040
path := r.apiPath + "/" + escapedNamespace + "/" + escapedGroupName
4141

42-
_, err := r.doRequest(path, "DELETE", nil)
43-
return err
42+
res, err := r.doRequest(path, "DELETE", nil)
43+
if err != nil {
44+
return err
45+
}
46+
47+
res.Body.Close()
48+
49+
return nil
4450
}
4551

4652
// GetRuleGroup retrieves a rule group

0 commit comments

Comments
 (0)