windy/tele-recv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add zap logger

Browse Source
This commit is contained in:
zhiqiang feng
2020-12-28 15:58:00 +08:00
parent c06ec0a519
commit 0619229ec5
10 changed files with 82 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/sqlite.go
+10 -9
View File
@@ -6,6 +6,7 @@ import (
"time"
_ "github.com/mattn/go-sqlite3"
"go.uber.org/zap"
)
const (
@@ -41,12 +42,12 @@ var (
func getDb() *sql.DB {
//log.Println("init database ", initTable)
if initTable && !initialized {
Log.Info("remove database file ", dbFile)
Log.Info("remove database ", zap.String("file", dbFile))
os.Remove(dbFile)
}
db, err := sql.Open(DbDriver, dbFile)
if err != nil {
Log.Fatal("error in open database ", err)
Log.Fatal("error in open database ", zap.Error(err))
}
return db
}
@@ -59,7 +60,7 @@ func InitDb(file string, init bool) error {
defer db.Close()
_, dbErr = db.Exec(TableCreate)
checkDbErr(dbErr, "error in create table")
Log.Infof("database %s initialized", dbFile)
Log.Info("database initialized")
initialized = true
return nil
}
@@ -82,9 +83,9 @@ func InsertTelegram(teleString string) {
checkDbErr(err, "error in insert telegram ")
isWriting = false
if insertSQL == InsertOld {
Log.Infof("telegram [%d] processed ", id)
Log.Info("telegram processed ", zap.Int64("id", id))
} else {
Log.Infof("telegram [%d] saved ", id)
Log.Info("telegram saved ", zap.Int64("id", id))
}
}
@@ -110,7 +111,7 @@ func LoadUnprocessed() {
func getTelegram(db *sql.DB) []telegram {
var telegrams []telegram
num := countTelegram()
Log.Infof("%n telegram unprocessed ", num)
Log.Info("telegram ", zap.Int64("unprocessed", num))
if num < 1 {
return telegrams
}
@@ -137,7 +138,7 @@ func processed(db *sql.DB, t telegram) {
result, err := stmt.Exec(t.id)
checkDbErr(err, "error in update telegram status")
id, _ := result.RowsAffected()
Log.Infof("[%d] telegram update : %t", id, id > 0)
Log.Info("telegram update : %t", zap.Int64("id", id), zap.Bool("result", id > 0))
isWriting = false
Log.Info("release lock")
tx.Commit()
@@ -156,7 +157,7 @@ func countTelegram() int64 {
func getWriteLock() {
count := 0
Log.Debugf("write lock : %t", isWriting)
Log.Debug("with ", zap.Bool("lock", isWriting))
for isWriting && count < 10 {
Log.Info("waiting for write ")
time.Sleep(5 * time.Second)
@@ -170,6 +171,6 @@ func getWriteLock() {
func checkDbErr(err error, msg string) {
if err != nil {
Log.Fatal(msg, err)
Log.Fatal(msg, zap.Error(err))
}
}