fix: linter

This commit is contained in:
d3m0k1d
2026-01-22 20:34:36 +03:00
parent 5f607d0be0
commit 7741e08ebc
3 changed files with 28 additions and 7 deletions

View File

@@ -3,12 +3,13 @@ package storage
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"os"
"time"
"github.com/d3m0k1d/BanForge/internal/config" "github.com/d3m0k1d/BanForge/internal/config"
"github.com/d3m0k1d/BanForge/internal/logger" "github.com/d3m0k1d/BanForge/internal/logger"
"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
"os"
"time"
) )
// Writer block // Writer block
@@ -18,7 +19,10 @@ type BanWriter struct {
} }
func NewBanWriter() (*BanWriter, error) { func NewBanWriter() (*BanWriter, error) {
db, err := sql.Open("sqlite", "/var/lib/banforge/bans.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)") db, err := sql.Open(
"sqlite",
"/var/lib/banforge/bans.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)",
)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -83,7 +87,11 @@ func (w *BanWriter) RemoveExpiredBans() ([]string, error) {
w.logger.Error("Failed to get expired bans", "error", err) w.logger.Error("Failed to get expired bans", "error", err)
return nil, err return nil, err
} }
defer rows.Close() defer func() {
if err := rows.Close(); err != nil {
w.logger.Error("Failed to close rows", "error", err)
}
}()
for rows.Next() { for rows.Next() {
var ip string var ip string

View File

@@ -3,6 +3,7 @@ package storage
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
) )
@@ -17,7 +18,11 @@ func CreateTables() error {
if err != nil { if err != nil {
return fmt.Errorf("failed to open requests db: %w", err) return fmt.Errorf("failed to open requests db: %w", err)
} }
defer db_r.Close() defer func() {
if err != nil {
db_r.Close()
}
}()
_, err = db_r.Exec(CreateRequestsTable) _, err = db_r.Exec(CreateRequestsTable)
if err != nil { if err != nil {
@@ -34,7 +39,11 @@ func CreateTables() error {
if err != nil { if err != nil {
return fmt.Errorf("failed to open bans db: %w", err) return fmt.Errorf("failed to open bans db: %w", err)
} }
defer db_b.Close() defer func() {
if err != nil {
db_b.Close()
}
}()
_, err = db_b.Exec(CreateBansTable) _, err = db_b.Exec(CreateBansTable)
if err != nil { if err != nil {

View File

@@ -2,6 +2,7 @@ package storage
import ( import (
"database/sql" "database/sql"
"github.com/d3m0k1d/BanForge/internal/logger" "github.com/d3m0k1d/BanForge/internal/logger"
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
) )
@@ -12,7 +13,10 @@ type Request_Writer struct {
} }
func NewRequestsWr() (*Request_Writer, error) { func NewRequestsWr() (*Request_Writer, error) {
db, err := sql.Open("sqlite", "/var/lib/banforge/requests.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)") db, err := sql.Open(
"sqlite",
"/var/lib/banforge/requests.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)",
)
if err != nil { if err != nil {
return nil, err return nil, err
} }