From 21175a923af14d4c68744c95cabcd8fe32dc254e Mon Sep 17 00:00:00 2001 From: risk danger olson Date: Tue, 13 Dec 2016 13:43:31 -0700 Subject: [PATCH] remove one more usage of ConcurrentTransfers() --- tq/manifest.go | 11 ++++++----- tq/transfer_queue.go | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tq/manifest.go b/tq/manifest.go index a9a7aa86..33e3ce29 100644 --- a/tq/manifest.go +++ b/tq/manifest.go @@ -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() diff --git a/tq/transfer_queue.go b/tq/transfer_queue.go index 1a283beb..3826cb01 100644 --- a/tq/transfer_queue.go +++ b/tq/transfer_queue.go @@ -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 }