1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00

Add logger

This commit is contained in:
Frédéric Guillot 2017-12-15 18:55:57 -08:00
parent c6d9eb3614
commit 1d8193b892
56 changed files with 228 additions and 192 deletions

View file

@ -7,10 +7,10 @@ package storage
import (
"errors"
"fmt"
"log"
"time"
"github.com/miniflux/miniflux/helper"
"github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/model"
"github.com/lib/pq"
@ -137,7 +137,7 @@ func (s *Storage) UpdateEntries(userID, feedID int64, entries model.Entries) (er
}
if err := s.CleanupEntries(feedID, entryHashes); err != nil {
log.Println(err)
logger.Error("[Storage:CleanupEntries] %v", err)
}
return nil

View file

@ -68,9 +68,9 @@ func (s *Storage) Integration(userID int64) (*model.Integration, error) {
)
switch {
case err == sql.ErrNoRows:
return nil, nil
return &integration, nil
case err != nil:
return nil, fmt.Errorf("unable to fetch integration row: %v", err)
return &integration, fmt.Errorf("unable to fetch integration row: %v", err)
}
return &integration, nil

View file

@ -6,9 +6,9 @@ package storage
import (
"fmt"
"log"
"strconv"
"github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/sql"
)
@ -27,7 +27,7 @@ func (s *Storage) Migrate() {
tx, err := s.db.Begin()
if err != nil {
log.Fatalln(err)
logger.Fatal("[Storage:Migrate] %v", err)
}
rawSQL := sql.SqlMap["schema_version_"+strconv.Itoa(version)]
@ -35,21 +35,21 @@ func (s *Storage) Migrate() {
_, err = tx.Exec(rawSQL)
if err != nil {
tx.Rollback()
log.Fatalln(err)
logger.Fatal("[Storage:Migrate] %v", err)
}
if _, err := tx.Exec(`delete from schema_version`); err != nil {
tx.Rollback()
log.Fatalln(err)
logger.Fatal("[Storage:Migrate] %v", err)
}
if _, err := tx.Exec(`insert into schema_version (version) values($1)`, version); err != nil {
tx.Rollback()
log.Fatalln(err)
logger.Fatal("[Storage:Migrate] %v", err)
}
if err := tx.Commit(); err != nil {
log.Fatalln(err)
logger.Fatal("[Storage:Migrate] %v", err)
}
}
}

View file

@ -6,10 +6,10 @@ package storage
import (
"database/sql"
"log"
// Postgresql driver import
_ "github.com/lib/pq"
"github.com/miniflux/miniflux/logger"
)
// Storage handles all operations related to the database.
@ -26,7 +26,7 @@ func (s *Storage) Close() {
func NewStorage(databaseURL string, maxOpenConns int) *Storage {
db, err := sql.Open("postgres", databaseURL)
if err != nil {
log.Fatalf("Unable to connect to the database: %v", err)
logger.Fatal("[Storage] Unable to connect to the database: %v", err)
}
db.SetMaxOpenConns(maxOpenConns)

View file

@ -8,7 +8,6 @@ import (
"database/sql"
"errors"
"fmt"
"log"
"strings"
"time"
@ -113,7 +112,7 @@ func (s *Storage) RemoveExtraField(userID int64, field string) error {
// UpdateUser updates a user.
func (s *Storage) UpdateUser(user *model.User) error {
defer helper.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UpdateUser] userID=%d", user.ID))
log.Println(user.EntryDirection)
if user.Password != "" {
hashedPassword, err := hashPassword(user.Password)
if err != nil {