update console to master branch

with new fixes

- improve download behavior
- avoid response timeouts
This commit is contained in:
Harshavardhana
2021-07-15 14:25:05 -07:00
parent ce800ed347
commit 9516587a6c
5 changed files with 12 additions and 12 deletions

View File

@@ -600,7 +600,9 @@ func mergeEntryChannels(ctx context.Context, in []chan metaCacheEntry, out chan<
out <- *best
last = best.name
} else {
console.Debugln("mergeEntryChannels: discarding duplicate", best.name, "<=", last)
if serverDebugLog {
console.Debugln("mergeEntryChannels: discarding duplicate", best.name, "<=", last)
}
}
// Replace entry we just sent.
if err := selectFrom(bestIdx); err != nil {

View File

@@ -866,7 +866,8 @@ func listPathRaw(ctx context.Context, opts listPathRawOptions) (err error) {
var combinedErr []string
for i, err := range errs {
if err != nil {
combinedErr = append(combinedErr, fmt.Sprintf("disk %d returned: %s", i, err))
combinedErr = append(combinedErr,
fmt.Sprintf("disk %s returned: %s", disks[i], err))
}
}
return errors.New(strings.Join(combinedErr, ", "))