projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10272: Fix nil pointer dereference in help message. refs #10272
[arvados.git]
/
services
/
keepstore
/
keepstore.go
diff --git
a/services/keepstore/keepstore.go
b/services/keepstore/keepstore.go
index 819d52fe0adecd71670ab89d57f1967b64368b4a..a04bc0b6fdf93296846ee5be48ffac46b535106f 100644
(file)
--- a/
services/keepstore/keepstore.go
+++ b/
services/keepstore/keepstore.go
@@
-130,6
+130,9
@@
var (
)
func (vs *volumeSet) String() string {
)
func (vs *volumeSet) String() string {
+ if vs == nil {
+ return "[]"
+ }
return fmt.Sprintf("%+v", (*vs)[:])
}
return fmt.Sprintf("%+v", (*vs)[:])
}
@@
-197,8
+200,8
@@
func main() {
flag.IntVar(
&permissionTTLSec,
"blob-signature-ttl",
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,
"See services/api/config/application.default.yml.")
flag.BoolVar(
&flagSerializeIO,
@@
-223,7
+226,7
@@
func main() {
flag.DurationVar(
&trashLifetime,
"trash-lifetime",
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,
"Time duration after a block is trashed during which it can be recovered using an /untrash request")
flag.DurationVar(
&trashCheckInterval,