From 9cfec440913ab09c966b45d17c86e5875197278c Mon Sep 17 00:00:00 2001 From: zhengjin Date: Wed, 11 Nov 2020 20:17:37 +0800 Subject: [PATCH 1/2] Fix nil issue when failed to register with coverage center. --- pkg/cover/instrument.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/cover/instrument.go b/pkg/cover/instrument.go index 63a007d..2a8c3e2 100644 --- a/pkg/cover/instrument.go +++ b/pkg/cover/instrument.go @@ -208,7 +208,11 @@ func registerSelf(address string) ([]byte, error) { log.Printf("[goc][WARN]error occurred:%v, try again", err) resp, err = http.DefaultClient.Do(req) } - defer resp.Body.Close() + defer func() { + if resp != nil { + resp.Body.Close() + } + }() if err != nil { return nil, fmt.Errorf("failed to register into coverage center, err:%v", err) From fb83028e8c2690854385dd5f8c1eeeedc37c38a7 Mon Sep 17 00:00:00 2001 From: zhengjin Date: Sat, 14 Nov 2020 13:52:53 +0800 Subject: [PATCH 2/2] Update as comments. --- pkg/cover/instrument.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/cover/instrument.go b/pkg/cover/instrument.go index 2a8c3e2..4484ecd 100644 --- a/pkg/cover/instrument.go +++ b/pkg/cover/instrument.go @@ -208,15 +208,10 @@ func registerSelf(address string) ([]byte, error) { log.Printf("[goc][WARN]error occurred:%v, try again", err) resp, err = http.DefaultClient.Do(req) } - defer func() { - if resp != nil { - resp.Body.Close() - } - }() - if err != nil { return nil, fmt.Errorf("failed to register into coverage center, err:%v", err) } + defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) if err != nil {