X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/12bfd7a65c6635a882cb2e5e419321db100b9d56..6a7beeebde1fed4ab925704238d1fb980e9fe238:/services/keepstore/keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 80d8670105..a04bc0b6fd 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"
@@ -129,6 +130,9 @@ var (
 )
 
 func (vs *volumeSet) String() string {
+	if vs == nil {
+		return "[]"
+	}
 	return fmt.Sprintf("%+v", (*vs)[:])
 }
 
@@ -196,8 +200,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,
@@ -222,7 +226,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,
@@ -332,7 +336,7 @@ func main() {
 
 	// Initialize Pull queue and worker
 	keepClient := &keepclient.KeepClient{
-		Arvados:       nil,
+		Arvados:       &arvadosclient.ArvadosClient{},
 		Want_replicas: 1,
 		Client:        &http.Client{},
 	}