diff --git a/auto/gui.files.go b/auto/gui.files.go index 4466672d..8f608eb2 100644 --- a/auto/gui.files.go +++ b/auto/gui.files.go @@ -1,4 +1,3 @@ - package auto import "github.com/cratonica/embed" diff --git a/config.go b/config.go index 6dfec700..9e54f5be 100644 --- a/config.go +++ b/config.go @@ -20,7 +20,7 @@ type Options struct { ExternalServer string `ini:"global-announce-server" default:"syncthing.nym.se:22025" description:"Global server for announcements"` ExternalDiscovery bool `ini:"global-announce-enabled" default:"true" description:"Announce to the global announce server"` LocalDiscovery bool `ini:"local-announce-enabled" default:"true" description:"Announce to the local network"` - RequestsInFlight int `ini:"parallell-requests" default:"16" description:"Maximum number of blocks to request in parallell"` + ParallelRequests int `ini:"parallel-requests" default:"16" description:"Maximum number of blocks to request in parallel"` LimitRate int `ini:"max-send-kbps" description:"Limit outgoing data rate (kbyte/s)"` ScanInterval time.Duration `ini:"rescan-interval" default:"60s" description:"Scan repository for changes this often"` ConnInterval time.Duration `ini:"reconnection-interval" default:"60s" description:"Attempt to (re)connect to peers this often"` diff --git a/main.go b/main.go index a0123e92..9d852c37 100644 --- a/main.go +++ b/main.go @@ -210,7 +210,7 @@ func main() { infoln("Deletes from peer nodes will be ignored") } okln("Ready to synchronize (read-write)") - m.StartRW(opts.Delete, opts.RequestsInFlight) + m.StartRW(opts.Delete, opts.ParallelRequests) } else { okln("Ready to synchronize (read only; no external updates accepted)") } diff --git a/model/model.go b/model/model.go index 1ee83731..815776b1 100644 --- a/model/model.go +++ b/model/model.go @@ -48,8 +48,8 @@ type Model struct { sup suppressor - parallellRequests int - limitRequestRate chan struct{} + parallelRequests int + limitRequestRate chan struct{} imut sync.Mutex // protects Index } @@ -130,7 +130,7 @@ func (m *Model) StartRW(del bool, threads int) { m.rwRunning = true m.delete = del - m.parallellRequests = threads + m.parallelRequests = threads go m.cleanTempFiles() if del { @@ -491,7 +491,7 @@ func (m *Model) AddConnection(rawConn io.Closer, protoConn Connection) { return } - for i := 0; i < m.parallellRequests; i++ { + for i := 0; i < m.parallelRequests; i++ { i := i go func() { if m.trace["pull"] {