Merge branch 'master' into 5365-not-link-unreadables

[arvados.git] / services / keepstore / pull_worker.go

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index 5a631e01587073fe5322700cf5e89e7924d88a9f..fac4bb15030eaaa8334bf375dc2a9baa4695fbb0 100644 (file)
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -23,7 +23,7 @@ func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
        nextItem := pullq.NextItem
        for item := range nextItem {
                pullRequest := item.(PullRequest)
-               err := Pull(item.(PullRequest), keepClient)
+               err := PullItemAndProcess(item.(PullRequest), GenerateRandomApiToken(), keepClient)
                if err == nil {
                        log.Printf("Pull %s success", pullRequest)
                } else {
@@ -39,8 +39,7 @@ func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
                Using this token & signature, retrieve the given block.
                Write to storage
 */
-func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error) {
-       token := GenerateRandomApiToken()
+func PullItemAndProcess(pullRequest PullRequest, token string, keepClient keepclient.KeepClient) (err error) {
        keepClient.Arvados.ApiToken = token
 
        service_roots := make(map[string]string)