tblyler/reg
1
0
Fork 0
mirror of https://github.com/genuinetools/reg.git synced 2024-09-28 11:46:20 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9 from puiterwijk/issue-8

Browse source 
Fix Issue 8 by reporting the error correctly and using a moveFile instead of os.Rename across mount points
This commit is contained in:
Jess Frazelle 2017-03-15 09:22:21 -07:00 committed by GitHub
commit 598f9e670f
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
server/server.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"html/template" "html/template"
"io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os" "os"
@ -42,6 +43,30 @@ func preload(c *cli.Context) (err error) {
return nil return nil
} }
func moveFile(src, dst string) (err error) {
in, err := os.Open(src)
if err != nil {
return err
}
defer in.Close()
tmp, err := ioutil.TempFile(filepath.Dir(dst), "")
if err != nil {
return err
}
_, err = io.Copy(tmp, in)
if err != nil {
tmp.Close()
os.Remove(tmp.Name())
return err
}
if err = tmp.Close(); err != nil {
os.Remove(tmp.Name())
return err
}
defer os.Remove(src)
return os.Rename(tmp.Name(), dst)
}
func main() { func main() {
app := cli.NewApp() app := cli.NewApp()
app.Name = "reg-server" app.Name = "reg-server"
@ -111,7 +136,7 @@ func main() {
// create the initial index // create the initial index
if err := createStaticIndex(r, staticDir, c.GlobalString("clair")); err != nil { if err := createStaticIndex(r, staticDir, c.GlobalString("clair")); err != nil {
return err return cli.NewExitError(fmt.Sprintf("Error creating index: %s", err.Error()), 1)
} }
// parse the duration // parse the duration
@ -278,7 +303,7 @@ func createStaticIndex(r *registry.Registry, staticDir, clairURI string) error {
index := filepath.Join(staticDir, "index.html") index := filepath.Join(staticDir, "index.html")
logrus.Infof("renaming the temporary file %s to %s", f.Name(), index) logrus.Infof("renaming the temporary file %s to %s", f.Name(), index)
if err := os.Rename(f.Name(), index); err != nil { if err := moveFile(f.Name(), index); err != nil {
return fmt.Errorf("renaming result from %s to %s failed: %v", f.Name(), index, err) return fmt.Errorf("renaming result from %s to %s failed: %v", f.Name(), index, err)
} }
updating = false updating = false