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

Trigger ItemFinished when temp file creation fails instead of failing silently

Browse Source
This commit is contained in:
Jakob Borg
2015-05-27 11:14:39 +02:00
parent e952da7f91
commit c1761cab49
4 changed files with 114 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/syncthing/verbose.go
View File

@@ -102,8 +102,12 @@ func (s *verboseSvc) formatEvent(ev events.Event) string {
return fmt.Sprintf("Started syncing %q / %q (%v %v)", data["folder"], data["item"], data["action"], data["type"])
case events.ItemFinished:
data := ev.Data.(map[string]interface{})
if err := data["err"]; err != nil {
return fmt.Sprintf("Finished syncing %q / %q (%v %v): %v", data["folder"], data["item"], data["action"], data["type"], err)
if err := data["error"]; err != nil {
// If the err interface{} is not nil, it is a string pointer.
// Dereference it to get the actual error or Sprintf will print
// the pointer value....
errStr := *err.(*string)
return fmt.Sprintf("Finished syncing %q / %q (%v %v): %v", data["folder"], data["item"], data["action"], data["type"], errStr)
}
return fmt.Sprintf("Finished syncing %q / %q (%v %v): Success", data["folder"], data["item"], data["action"], data["type"])