rnhmjoj/magnetico
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

better error handling at sqlite3.go

Browse Source
This commit is contained in:
Bora M. Alper 2018-12-30 08:24:44 +03:00
parent e7f5fb0831
commit e01a3bed40
No known key found for this signature in database
GPG Key ID: 8F1A9504E1BD114D
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/persistence/sqlite3.go
View File

@ -318,7 +318,7 @@ func (db *sqlite3Database) QueryTorrents(
queryArgs = append(queryArgs, limit) queryArgs = append(queryArgs, limit)
rows, err := db.conn.Query(sqlQuery, queryArgs...) rows, err := db.conn.Query(sqlQuery, queryArgs...)
defer rows.Close() defer closeRows(rows)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "query error") return nil, errors.Wrap(err, "query error")
} }
@ -375,7 +375,7 @@ func (db *sqlite3Database) GetTorrent(infoHash []byte) (*TorrentMetadata, error)
WHERE info_hash = ?`, WHERE info_hash = ?`,
infoHash, infoHash,
) )
defer rows.Close() defer closeRows(rows)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -396,7 +396,7 @@ func (db *sqlite3Database) GetFiles(infoHash []byte) ([]File, error) {
rows, err := db.conn.Query( rows, err := db.conn.Query(
"SELECT size, path FROM files, torrents WHERE files.torrent_id = torrents.id AND torrents.info_hash = ?;", "SELECT size, path FROM files, torrents WHERE files.torrent_id = torrents.id AND torrents.info_hash = ?;",
infoHash) infoHash)
defer rows.Close() defer closeRows(rows)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -453,7 +453,7 @@ func (db *sqlite3Database) GetStatistics(from string, n uint) (*Statistics, erro
GROUP BY dt;`, GROUP BY dt;`,
timef), timef),
fromTime.Unix(), toTime.Unix()) fromTime.Unix(), toTime.Unix())
defer rows.Close() defer closeRows(rows)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -687,3 +687,9 @@ func executeTemplate(text string, data interface{}, funcs template.FuncMap) stri
} }
return buf.String() return buf.String()
} }
func closeRows(rows *sql.Rows) {
if err := rows.Close(); err != nil {
zap.L().Error("could not close row", zap.Error(err))
}
}