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

Correctly handle nil error in verbose logging (fixes #1921)

Browse Source
This commit is contained in:
Jakob Borg 2015-06-09 09:04:03 +02:00
parent 197bfa9f11
commit ef6f52f688
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/syncthing/verbose.go
View File

@ -102,12 +102,11 @@ 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"]) return fmt.Sprintf("Started syncing %q / %q (%v %v)", data["folder"], data["item"], data["action"], data["type"])
case events.ItemFinished: case events.ItemFinished:
data := ev.Data.(map[string]interface{}) data := ev.Data.(map[string]interface{})
if err := data["error"]; err != nil { if err, ok := data["error"].(*string); ok && err != nil {
// If the err interface{} is not nil, it is a string pointer. // If the err interface{} is not nil, it is a string pointer.
// Dereference it to get the actual error or Sprintf will print // Dereference it to get the actual error or Sprintf will print
// the pointer value.... // the pointer value....
errStr := *err.(*string) return fmt.Sprintf("Finished syncing %q / %q (%v %v): %v", data["folder"], data["item"], data["action"], data["type"], *err)
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"]) return fmt.Sprintf("Finished syncing %q / %q (%v %v): Success", data["folder"], data["item"], data["action"], data["type"])