lib: Replace done channel with contexts in and add names to util services (#6166)

2019-11-21 08:41:15 +01:00
parent 552ea68672
commit 90d85fd0a2
34 changed files with 240 additions and 218 deletions
--- a/lib/model/folder_sendrecv.go
+++ b/lib/model/folder_sendrecv.go
@@ -118,7 +118,7 @@ func newSendReceiveFolder(model *model, fset *db.FileSet, ignores *ignore.Matche
 		pullErrorsMut: sync.NewMutex(),
 	}
 	f.folder.puller = f
-	f.folder.Service = util.AsService(f.serve)
+	f.folder.Service = util.AsService(f.serve, f.String())

 	if f.Copiers == 0 {
 		f.Copiers = defaultCopiers