Merge branch 'master' into 4426-search-documentation

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

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index b6ab8faca13970e852d6f2c59f02c9ac4bbb8e01..1e8c3d1e0fbd62f9dea1a2efce54a0a73b911a41 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -13,6 +13,8 @@ import (
        "strings"
        "syscall"
        "time"
+       "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+       "git.curoverse.com/arvados.git/sdk/go/keepclient"
 )
 
 // ======================
@@ -275,8 +277,18 @@ func main() {
        }
 
        // Initialize Pull queue and worker
+       arv, err := arvadosclient.MakeArvadosClient()
+       if err != nil {
+               log.Fatalf("Error setting up arvados client %s", err.Error())
+       }
+
+       keepClient, err := keepclient.MakeKeepClient(&arv)
+       if err != nil {
+               log.Fatalf("Error setting up keep client %s", err.Error())
+       }
+
        pullq = NewWorkQueue()
-       go RunPullWorker(pullq.NextItem)
+       go RunPullWorker(pullq, keepClient)
 
        // Shut down the server gracefully (by closing the listener)
        // if SIGTERM is received.