X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8b097ea832516b3f5104c62a40a6d9cf4826232a..c1ac820b37938e3b9a533d93b55eb12a0808cf0d:/services/keepstore/keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 93ee43c446..48b83de4b8 100644
--- 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 {
@@ -195,8 +197,8 @@ func main() {
 	flag.IntVar(
 		&permissionTTLSec,
 		"blob-signature-ttl",
-		int(time.Duration(2*7*24*time.Hour).Seconds()),
-		"Lifetime of blob permission signatures. Modifying the ttl will invalidate all existing signatures. "+
+		2*7*24*3600,
+		"Lifetime of blob permission signatures in seconds. Modifying the ttl will invalidate all existing signatures. "+
 			"See services/api/config/application.default.yml.")
 	flag.BoolVar(
 		&flagSerializeIO,
@@ -221,7 +223,7 @@ func main() {
 	flag.DurationVar(
 		&trashLifetime,
 		"trash-lifetime",
-		0*time.Second,
+		0,
 		"Time duration after a block is trashed during which it can be recovered using an /untrash request")
 	flag.DurationVar(
 		&trashCheckInterval,
@@ -331,7 +333,7 @@ func main() {
 
 	// Initialize Pull queue and worker
 	keepClient := &keepclient.KeepClient{
-		Arvados:       nil,
+		Arvados:       &arvadosclient.ArvadosClient{},
 		Want_replicas: 1,
 		Client:        &http.Client{},
 	}