Skip to content

Commit 5186050

Browse files
committed
fix(couchbase): return decode errors from ListUsers instead of log.Fatal
log.Fatal calls os.Exit(1), so one malformed row would crash the whole server on an admin list call. Flagged independently by both review passes on this PR since it now also covers decodeDocument failures.
1 parent c00db32 commit 5186050

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

  • internal/storage/db/couchbase

internal/storage/db/couchbase/user.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"log"
87
"strings"
98
"time"
109

@@ -102,11 +101,11 @@ func (p *provider) ListUsers(ctx context.Context, pagination *model.Pagination)
102101
for queryResult.Next() {
103102
var raw json.RawMessage
104103
if err := queryResult.Row(&raw); err != nil {
105-
log.Fatal(err)
104+
return nil, nil, err
106105
}
107106
user := &schemas.User{}
108107
if err := decodeDocument(raw, user); err != nil {
109-
log.Fatal(err)
108+
return nil, nil, err
110109
}
111110
users = append(users, user)
112111
}

0 commit comments

Comments
 (0)