mirror of
https://github.com/nkanaev/yarr.git
synced 2026-04-30 14:27:45 +00:00
switch to the standard logger
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
package storage
|
||||
|
||||
import "encoding/json"
|
||||
import (
|
||||
"encoding/json"
|
||||
"log"
|
||||
)
|
||||
|
||||
func settingsDefaults() map[string]interface{} {
|
||||
return map[string]interface{}{
|
||||
@@ -28,7 +31,7 @@ func (s *Storage) GetSettingsValue(key string) interface{} {
|
||||
}
|
||||
var valDecoded interface{}
|
||||
if err := json.Unmarshal([]byte(val), &valDecoded); err != nil {
|
||||
s.log.Print(err)
|
||||
log.Print(err)
|
||||
return nil
|
||||
}
|
||||
return valDecoded
|
||||
@@ -48,7 +51,7 @@ func (s *Storage) GetSettings() map[string]interface{} {
|
||||
result := settingsDefaults()
|
||||
rows, err := s.db.Query(`select key, val from settings;`)
|
||||
if err != nil {
|
||||
s.log.Print(err)
|
||||
log.Print(err)
|
||||
return result
|
||||
}
|
||||
for rows.Next() {
|
||||
@@ -58,7 +61,7 @@ func (s *Storage) GetSettings() map[string]interface{} {
|
||||
|
||||
rows.Scan(&key, &val)
|
||||
if err = json.Unmarshal([]byte(val), &valDecoded); err != nil {
|
||||
s.log.Print(err)
|
||||
log.Print(err)
|
||||
continue
|
||||
}
|
||||
result[key] = valDecoded
|
||||
@@ -74,7 +77,7 @@ func (s *Storage) UpdateSettings(kv map[string]interface{}) bool {
|
||||
}
|
||||
valEncoded, err := json.Marshal(val)
|
||||
if err != nil {
|
||||
s.log.Print(err)
|
||||
log.Print(err)
|
||||
return false
|
||||
}
|
||||
_, err = s.db.Exec(`
|
||||
@@ -83,7 +86,7 @@ func (s *Storage) UpdateSettings(kv map[string]interface{}) bool {
|
||||
key, valEncoded, valEncoded,
|
||||
)
|
||||
if err != nil {
|
||||
s.log.Print(err)
|
||||
log.Print(err)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user