Merge pull request #1699 from calmh/connsvc

Break out connection handling into a service
2015-04-25 15:37:08 +01:00
parent 696b67e4b1 266a5116a1
commit ecc8591c95
2 changed files with 92 additions and 30 deletions
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -584,7 +584,9 @@ func syncthingMain() {

 	// Routine to connect out to configured devices
 	discoverer = discovery(externalPort)
-	go listenConnect(myID, m, tlsCfg)
+
+	connectionSvc := newConnectionSvc(cfg, myID, m, tlsCfg)
+	mainSvc.Add(connectionSvc)

 	for _, folder := range cfg.Folders() {
 		// Routine to pull blocks from other devices to synchronize the local