remove one more usage of ConcurrentTransfers()

This commit is contained in:
risk danger olson 2016-12-13 13:43:31 -07:00
parent 530cbf39ce
commit 21175a923a
2 changed files with 7 additions and 6 deletions

@ -32,13 +32,14 @@ func ConfigureManifest(m *Manifest, cfg *config.Configuration) *Manifest {
m.MaxRetries = 1
}
if cfg.NtlmAccess("download") {
m.ConcurrentTransfers = 1
if m.MaxRetries < 1 {
m.MaxRetries = defaultMaxRetries
}
if m.MaxRetries < 1 {
tracerx.Printf("manifest: invalid retry count: %d, defaulting to %d", m.MaxRetries, 1)
m.MaxRetries = 1
if cfg.NtlmAccess("download") {
m.ConcurrentTransfers = 1
} else if m.ConcurrentTransfers < 1 {
m.ConcurrentTransfers = 3
}
m.basicTransfersOnly = cfg.BasicTransfersOnly()

@ -523,7 +523,7 @@ func (q *TransferQueue) ensureAdapterBegun() error {
}
tracerx.Printf("tq: starting transfer adapter %q", q.adapter.Name())
err := q.adapter.Begin(config.Config.ConcurrentTransfers(), cb)
err := q.adapter.Begin(q.manifest.ConcurrentTransfers, cb)
if err != nil {
return err
}