diff --git a/internal/storage/requests_db.go b/internal/storage/requests_db.go index de29c2a..d220f61 100644 --- a/internal/storage/requests_db.go +++ b/internal/storage/requests_db.go @@ -7,12 +7,12 @@ import ( _ "modernc.org/sqlite" ) -type Request_Writer struct { +type RequestWriter struct { logger *logger.Logger db *sql.DB } -func NewRequestsWr() (*Request_Writer, error) { +func NewRequestsWr() (*RequestWriter, error) { db, err := sql.Open( "sqlite", "/var/lib/banforge/requests.db?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)", @@ -23,7 +23,7 @@ func NewRequestsWr() (*Request_Writer, error) { db.SetMaxOpenConns(1) db.SetMaxIdleConns(1) db.SetConnMaxLifetime(0) - return &Request_Writer{ + return &RequestWriter{ logger: logger.New(false), db: db, }, nil diff --git a/internal/storage/writer.go b/internal/storage/writer.go index 8b63be1..576b2c2 100644 --- a/internal/storage/writer.go +++ b/internal/storage/writer.go @@ -4,7 +4,7 @@ import ( "time" ) -func WriteReq(db *Request_Writer, resultCh <-chan *LogEntry) { +func WriteReq(db *RequestWriter, resultCh <-chan *LogEntry) { db.logger.Info("Starting log writer") const batchSize = 100 const flushInterval = 1 * time.Second diff --git a/internal/storage/writer_test.go b/internal/storage/writer_test.go index 5b1be20..68b31e5 100644 --- a/internal/storage/writer_test.go +++ b/internal/storage/writer_test.go @@ -277,7 +277,7 @@ func TestWrite_ChannelClosed(t *testing.T) { } } -func NewRequestWriterWithDBPath(dbPath string) (*Request_Writer, error) { +func NewRequestWriterWithDBPath(dbPath string) (*RequestWriter, error) { db, err := sql.Open("sqlite", dbPath+"?_pragma=journal_mode(WAL)&_pragma=busy_timeout(30000)&_pragma=synchronous(NORMAL)") if err != nil { return nil, err @@ -285,13 +285,13 @@ func NewRequestWriterWithDBPath(dbPath string) (*Request_Writer, error) { db.SetMaxOpenConns(1) db.SetMaxIdleConns(1) db.SetConnMaxLifetime(0) - return &Request_Writer{ + return &RequestWriter{ logger: logger.New(false), db: db, }, nil } -func (w *Request_Writer) CreateTable() error { +func (w *RequestWriter) CreateTable() error { _, err := w.db.Exec(CreateRequestsTable) if err != nil { return err @@ -300,7 +300,7 @@ func (w *Request_Writer) CreateTable() error { return nil } -func (w *Request_Writer) Close() error { +func (w *RequestWriter) Close() error { w.logger.Info("Closing request database connection") err := w.db.Close() if err != nil { @@ -309,7 +309,7 @@ func (w *Request_Writer) Close() error { return nil } -func (w *Request_Writer) GetRequestCount() (int, error) { +func (w *RequestWriter) GetRequestCount() (int, error) { var count int err := w.db.QueryRow("SELECT COUNT(*) FROM requests").Scan(&count) if err != nil {