filehandles: closed resp.body in cloud sync

clouds/fetch.go

@@ -58,6 +58,13 @@ func (resp *fetchResponse) json(data interface{}) error {
 	return err
 }
 
+func (resp *fetchResponse) Close() error {
+	if resp.body == nil {
+		return nil
+	}
+	return resp.body.Close()
+}
+
 func (resp *fetchResponse) text() string {
 	if resp.body == nil {
 		return ""

clouds/initial_sync.go

@@ -34,6 +34,8 @@ func (cloud *Cloud) authenticate() int {
 		},
 		body: bytes.NewReader(body),
 	})
+	defer resp.Close()
+
 	if !resp.ok {
 		if resp.status <= 0 {
 			cloud.Printf("Can not connect to server.\n%s", resp.status, resp.statusText)
@@ -89,6 +91,8 @@ func (cloud *Cloud) initialSync() int {
 			},
 			body: bytes.NewReader(body),
 		})
+		defer resp.Close()
+
 		if resp.status == http.StatusUnprocessableEntity {
 			log.Printf("[UP   ] Gateway already registered.")
 			// cloud.Printf("Gateway already registered.", 200)
@@ -124,10 +128,12 @@ func (cloud *Cloud) initialSync() int {
 				"Authorization": cloud.auth,
 			},
 		})
+
 		switch resp.status {
 		case http.StatusNotFound:
 			// log.Printf("[UP   ] Device %q not found.", device.ID)
 			cloud.flag(Entity{device.ID, "", ""}, ActionCreate, noTime, meta)
+			resp.Close()
 
 		case http.StatusOK:
 			var device2 v2Device
@@ -202,6 +208,8 @@ func (cloud *Cloud) initialSync() int {
 
 		default:
 			cloud.Printf("Communication Error\nUnexpected response: %s:\n%s", 500, resp.statusText, resp.text())
+			resp.Close()
+
 			return resp.status
 		}
 	}

clouds/persistent_sync.go

@@ -345,6 +345,7 @@ func (cloud *Cloud) postDevice(device *edge.Device) (int, error) {
 		},
 		body: bytes.NewReader(body),
 	})
+	defer resp.Close()
 
 	if !resp.ok {
 		err := fmt.Errorf("Unable to push device.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
@@ -365,6 +366,7 @@ func (cloud *Cloud) postDeviceName(deviceID string, name string) (int, error) {
 		},
 		body: bytes.NewReader([]byte(name)),
 	})
+	defer resp.Close()
 
 	if !resp.ok {
 		err := fmt.Errorf("Unable to change device name.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
@@ -380,6 +382,7 @@ func (cloud *Cloud) postDeviceName(deviceID string, name string) (int, error) {
 			},
 			body: bytes.NewReader([]byte(name)),
 		})
+		defer resp.Close()
 
 		if !resp.ok {
 			err := fmt.Errorf("Unable to change device name.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
@@ -406,6 +409,8 @@ func (cloud *Cloud) postSensor(deviceID string, sensor *edge.Sensor) (int, error
 		},
 		body: bytes.NewReader(body),
 	})
+	defer resp.Close()
+
 	if !resp.ok {
 		err := fmt.Errorf("Unable to push sensor.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
 		return resp.status, err
@@ -425,6 +430,7 @@ func (cloud *Cloud) postSensorName(deviceID string, sensorID string, name string
 		},
 		body: bytes.NewReader([]byte(name)),
 	})
+	defer resp.Close()
 
 	if !resp.ok {
 		err := fmt.Errorf("Unable to change sensor name.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
@@ -449,6 +455,8 @@ func (cloud *Cloud) postActuator(deviceID string, actuator *edge.Actuator) (int,
 		},
 		body: bytes.NewReader(body),
 	})
+	defer resp.Close()
+
 	if !resp.ok {
 		err := fmt.Errorf("Unable to push actuator.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
 		return resp.status, err
@@ -468,6 +476,7 @@ func (cloud *Cloud) postActuatorName(deviceID string, actuatorID string, name st
 		},
 		body: bytes.NewReader([]byte(name)),
 	})
+	defer resp.Close()
 
 	if !resp.ok {
 		err := fmt.Errorf("Unable to change actuator name.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
@@ -517,6 +526,8 @@ func (cloud *Cloud) postValues(deviceID string, sensorID string, values edge.Val
 		},
 		body: &buf,
 	})
+	defer resp.Close()
+
 	if !resp.ok {
 		err := fmt.Errorf("Unable to push values.\nStatus: %s\n%s", resp.statusText, strings.TrimSpace(resp.text()))
 		return noTime, 0, resp.status, err