Merge pull request #189 from ebfe/cache-file

Various cache file handling fixes

Author: moul

pkg/api/cache.go

@@ -181,16 +181,22 @@ func (c *ScalewayCache) Save() error {
 	logrus.Debugf("Writing cache file to disk")
 
 	if c.Modified {
-		file, err := ioutil.TempFile("", "")
+		file, err := ioutil.TempFile(filepath.Dir(c.Path), filepath.Base(c.Path))
 		if err != nil {
 			return err
 		}
+		defer file.Close()
 		encoder := json.NewEncoder(file)
 		err = encoder.Encode(*c)
 		if err != nil {
+			os.Remove(file.Name())
+			return err
+		}
+
+		if err := os.Rename(file.Name(), c.Path); err != nil {
+			os.Remove(file.Name())
 			return err
 		}
-		return os.Rename(file.Name(), c.Path)
 	}
 	return nil
 }