Skip to content

Commit 948ab9b

Browse files
committed
handle sql query error
1 parent 4c75ef2 commit 948ab9b

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

apiserver/api/api.go

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func (a *api) gatewayConfig(w http.ResponseWriter, r *http.Request) {
2727
clients, err := a.db.ReadClients()
2828

2929
if err != nil {
30+
log.Errorf("reading clients from database: %v", err)
3031
w.WriteHeader(http.StatusInternalServerError)
3132
return
3233
}

apiserver/database/database.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@ func (d *database) ReadClients() (clients []Client, err error) {
5252
rows, err := d.conn.Query(ctx, query)
5353

5454
if err != nil {
55-
return nil, fmt.Errorf("querying for clients: %s", err)
55+
return nil, fmt.Errorf("querying for clients: %v", err)
56+
}
57+
58+
defer rows.Close()
59+
60+
if rows.Err() != nil {
61+
return nil, fmt.Errorf("querying for clients: %v", rows.Err())
5662
}
5763

5864
for rows.Next() {

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ require (
77
github.com/jackc/pgx/v4 v4.5.0
88
github.com/lib/pq v1.3.0
99
github.com/sirupsen/logrus v1.4.2
10-
github.com/spf13/pflag v1.0.5 // indirect
10+
github.com/spf13/pflag v1.0.5
1111
)

0 commit comments

Comments
 (0)