unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

expiry can be taken from options or record (#1928)

Browse Source
This commit is contained in:
Dominic Wong 2020-08-11 18:11:18 +01:00 committed by GitHub
parent b6e1c7ac99
commit 69a53e8070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
store/cockroach/cockroach.go
View File

@ -422,13 +422,14 @@ func (s *sqlStore) Write(r *store.Record, opts ...store.WriteOption) error {
metadata[k] = v metadata[k] = v
} }
if r.Expiry != 0 { var expiry time.Time
_, err = st.Exec(r.Key, r.Value, metadata, time.Now().Add(r.Expiry)) // expiry from options takes precedence
} else { if !options.Expiry.IsZero() {
_, err = st.Exec(r.Key, r.Value, metadata, nil) expiry = options.Expiry
} else if r.Expiry != 0 {
expiry = time.Now().Add(r.Expiry)
} }
if _, err := st.Exec(r.Key, r.Value, metadata, expiry); err != nil {
if err != nil {
return errors.Wrap(err, "Couldn't insert record "+r.Key) return errors.Wrap(err, "Couldn't insert record "+r.Key)
} }