Merge pull request getlantern#4330 from getlantern/issue-4327

fffw · fffw · commit 002ae1630f3d · 2016-05-31T15:47:03.000+08:00
Issue 4327
diff --git a/src/github.com/getlantern/flashlight/config/fetcher.go b/src/github.com/getlantern/flashlight/config/fetcher.go
@@ -180,7 +180,7 @@ func (cf *fetcher) fetchCloudConfig(cfg *Config) ([]byte, error) {
 	}
 	defer func() {
 		if closeerr := resp.Body.Close(); closeerr != nil {
-			log.Debugf("Error closing response body: %v", closeerr)
+			log.Errorf("Error closing response body: %v", closeerr)
 		}
 	}()
 
@@ -199,6 +199,13 @@ func (cf *fetcher) fetchCloudConfig(cfg *Config) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("Unable to open gzip reader: %s", err)
 	}
+
+	defer func() {
+		if err := gzReader.Close(); err != nil {
+			log.Errorf("Unable to close gzip reader: %v", err)
+		}
+	}()
+
 	log.Debugf("Fetched cloud config")
 	return ioutil.ReadAll(gzReader)
 }
diff --git a/src/github.com/getlantern/flashlight/feed/feed.go b/src/github.com/getlantern/flashlight/feed/feed.go
@@ -181,14 +181,24 @@ func doGetFeed(feedEndpoint string, locale string, shouldProxy bool, allStr stri
 		return
 	}
 
-	defer res.Body.Close()
+	defer func() {
+		if err := res.Body.Close(); err != nil {
+			handleError(fmt.Errorf("Error closing response body: %v", err))
+		}
+	}()
 
 	gzReader, err := gzip.NewReader(res.Body)
 	if err != nil {
 		handleError(fmt.Errorf("Unable to open gzip reader: %s", err))
 		return
 	}
 
+	defer func() {
+		if err := gzReader.Close(); err != nil {
+			handleError(fmt.Errorf("Unable to close gzip reader: %s", err))
+		}
+	}()
+
 	contents, err := ioutil.ReadAll(gzReader)
 	if err != nil {
 		handleError(fmt.Errorf("Error reading feed: %v", err))

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func (cf fetcher) fetchCloudConfig(cfg Config) ([]byte, error) {`
`180`	`180`	`}`
`181`	`181`	`defer func() {`
`182`	`182`	`if closeerr := resp.Body.Close(); closeerr != nil {`
`183`		`- log.Debugf("Error closing response body: %v", closeerr)`
	`183`	`+ log.Errorf("Error closing response body: %v", closeerr)`
`184`	`184`	`}`
`185`	`185`	`}()`
`186`	`186`
`@@ -199,6 +199,13 @@ func (cf fetcher) fetchCloudConfig(cfg Config) ([]byte, error) {`
`199`	`199`	`if err != nil {`
`200`	`200`	`return nil, fmt.Errorf("Unable to open gzip reader: %s", err)`
`201`	`201`	`}`
	`202`	`+`
	`203`	`+ defer func() {`
	`204`	`+ if err := gzReader.Close(); err != nil {`
	`205`	`+ log.Errorf("Unable to close gzip reader: %v", err)`
	`206`	`+ }`
	`207`	`+ }()`
	`208`	`+`
`202`	`209`	`log.Debugf("Fetched cloud config")`
`203`	`210`	`return ioutil.ReadAll(gzReader)`
`204`	`211`	`}`