mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-22 15:57:07 +00:00
Code Issues Releases Wiki Activity

walk: Honor close of the done channel

Browse source
This commit is contained in:
Alexander Neumann 2015-07-11 15:51:18 +02:00
parent 1c14be8993
commit 8dba52dd71
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
walk.go
View file

@ -21,7 +21,11 @@ func walkTree(repo *repository.Repository, path string, treeID backend.ID, done
t, err := LoadTree(repo, treeID) t, err := LoadTree(repo, treeID)
if err != nil { if err != nil {
jobCh <- WalkTreeJob{Path: path, Error: err} select {
case jobCh <- WalkTreeJob{Path: path, Error: err}:
case <-done:
return
}
return return
} }
@ -30,11 +34,20 @@ func walkTree(repo *repository.Repository, path string, treeID backend.ID, done
if node.Type == "dir" { if node.Type == "dir" {
walkTree(repo, p, node.Subtree, done, jobCh) walkTree(repo, p, node.Subtree, done, jobCh)
} else { } else {
jobCh <- WalkTreeJob{Path: p, Node: node} select {
case jobCh <- WalkTreeJob{Path: p, Node: node}:
case <-done:
return
}
} }
} }
jobCh <- WalkTreeJob{Path: path, Tree: t} select {
case jobCh <- WalkTreeJob{Path: path, Tree: t}:
case <-done:
return
}
debug.Log("walkTree", "done for %q (%v)", path, treeID.Str()) debug.Log("walkTree", "done for %q (%v)", path, treeID.Str())
} }