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

Correct type assertion in verbose logger, restart (fixes #2561)

Browse Source
This commit is contained in:
Jakob Borg 2015-12-07 08:02:24 +01:00
parent 2ab07f3aac
commit 3318651565
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/syncthing/verbose.go
View File

@ -32,8 +32,14 @@ func (s *verboseSvc) Serve() {
sub := events.Default.Subscribe(events.AllEvents) sub := events.Default.Subscribe(events.AllEvents)
defer events.Default.Unsubscribe(sub) defer events.Default.Unsubscribe(sub)
// We're ready to start processing events. select {
case <-s.started:
// The started channel has already been closed; do nothing.
default:
// This is the first time around. Indicate that we're ready to start
// processing events.
close(s.started) close(s.started)
}
for { for {
select { select {
@ -96,7 +102,7 @@ func (s *verboseSvc) formatEvent(ev events.Event) string {
return fmt.Sprintf("Rejected unshared folder %q from device %v", data["folder"], data["device"]) return fmt.Sprintf("Rejected unshared folder %q from device %v", data["folder"], data["device"])
case events.ItemStarted: case events.ItemStarted:
data := ev.Data.(map[string]interface{}) data := ev.Data.(map[string]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{})