Merge branch 'master' into 8876-work-unit

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

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 93ee43c446cf96624a09a0ff7660d198cacdd3cd..d7da67c348d8b7f4e505ecda5010fd5ca802440d 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -4,6 +4,7 @@ import (
        "bytes"
        "flag"
        "fmt"
+       "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
        "io/ioutil"
@@ -91,6 +92,7 @@ var (
        TooLongError        = &KeepError{413, "Block is too large"}
        MethodDisabledError = &KeepError{405, "Method disabled"}
        ErrNotImplemented   = &KeepError{500, "Unsupported configuration"}
+       ErrClientDisconnect = &KeepError{503, "Client disconnected"}
 )
 
 func (e *KeepError) Error() string {
@@ -330,8 +332,12 @@ func main() {
        }
 
        // Initialize Pull queue and worker
+       arv, err := arvadosclient.MakeArvadosClient()
+       if err != nil {
+               log.Fatalf("MakeArvadosClient: %s", err)
+       }
        keepClient := &keepclient.KeepClient{
-               Arvados:       nil,
+               Arvados:       &arv,
                Want_replicas: 1,
                Client:        &http.Client{},
        }