9996: Stop retrieving collections if a fatal error makes any further work futile.

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

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index d7da67c348d8b7f4e505ecda5010fd5ca802440d..48b83de4b8aa2a40e62be953e236162d396ddae0 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -197,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,
@@ -223,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,
@@ -332,12 +332,8 @@ func main() {
        }
 
        // Initialize Pull queue and worker
-       arv, err := arvadosclient.MakeArvadosClient()
-       if err != nil {
-               log.Fatalf("MakeArvadosClient: %s", err)
-       }
        keepClient := &keepclient.KeepClient{
-               Arvados:       &arv,
+               Arvados:       &arvadosclient.ArvadosClient{},
                Want_replicas: 1,
                Client:        &http.Client{},
        }