perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Locking around osutil.Rename and some descriptive text

Browse Source
This commit is contained in:
Jakob Borg
2014-09-22 15:48:46 +02:00
parent 7fd2e4d2db
commit 4ddd87e773
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
model/model.go
View File

@@ -630,13 +630,6 @@ func (m *Model) SetIgnores(repo string, content []string) error {
fmt.Fprintln(writer, line)
}
err = writer.Flush()
if err != nil {
l.Warnln("Saving .stignore:", err)
fd.Close()
return err
}
err = fd.Close()
if err != nil {
l.Warnln("Saving .stignore:", err)
@@ -644,10 +637,7 @@ func (m *Model) SetIgnores(repo string, content []string) error {
}
file := filepath.Join(cfg.Directory, ".stignore")
m.rmut.Lock()
os.Remove(file)
err = osutil.Rename(fd.Name(), file)
m.rmut.Unlock()
err = osutil.Rename(tmpFileName, file)
if err != nil {
l.Warnln("Saving .stignore:", err)
return err