add zap for default logger

This commit is contained in:
zhiqiang feng
2020-12-28 11:06:36 +08:00
parent f43412b235
commit 2cbfbdbbca
9 changed files with 81 additions and 45 deletions
+15 -16
View File
@@ -2,7 +2,6 @@ package utils
import (
"database/sql"
"log"
"os"
"time"
@@ -42,12 +41,12 @@ var (
func getDb() *sql.DB {
//log.Println("init database ", initTable)
if initTable && !initialized {
log.Println("remove database file", dbFile)
Log.Info("remove database 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 ", err)
}
return db
}
@@ -60,7 +59,7 @@ func InitDb(file string, init bool) error {
defer db.Close()
_, dbErr = db.Exec(TableCreate)
checkDbErr(dbErr, "error in create table")
log.Println("database ", db, " initialized")
Log.Infof("database %s initialized", dbFile)
initialized = true
return nil
}
@@ -83,14 +82,14 @@ func InsertTelegram(teleString string) {
checkDbErr(err, "error in insert telegram ")
isWriting = false
if insertSQL == InsertOld {
log.Println("telegram processed ", id)
Log.Infof("telegram [%n] processed ", id)
} else {
log.Println("telegram saved ", id)
Log.Infof("telegram [%n] saved ", id)
}
}
func LoadUnprocessed() {
log.Println("loading telegram")
Log.Info("loading telegram")
db := getDb()
defer db.Close()
for {
@@ -105,17 +104,17 @@ func LoadUnprocessed() {
}
}
ClientReady = true
log.Println("client is ready for new telegram")
Log.Info("client is ready for new telegram")
}
func getTelegram(db *sql.DB) []telegram {
var telegrams []telegram
num := countTelegram()
log.Println("unprocessed : ", num)
Log.Infof("%n telegram unprocessed ", num)
if num < 1 {
return telegrams
}
log.Println("try to load unprocessed telegram ", num)
Log.Info("try to load unprocessed telegram ")
rows, err := db.Query(load)
checkDbErr(err, "error in query telegram")
defer rows.Close()
@@ -138,9 +137,9 @@ func processed(db *sql.DB, t telegram) {
result, err := stmt.Exec(t.id)
checkDbErr(err, "error in update telegram status")
id, _ := result.RowsAffected()
log.Println(t.id, " telegram update : ", id > 0)
Log.Infof("[%n] telegram update : %b", id, id > 0)
isWriting = false
log.Println("release lock")
Log.Info("release lock")
tx.Commit()
}
@@ -157,20 +156,20 @@ func countTelegram() int64 {
func getWriteLock() {
count := 0
log.Println("write lock :", isWriting)
Log.Infof("write lock : %b", isWriting)
for isWriting && count < 10 {
log.Println("waiting for write ")
Log.Info("waiting for write ")
time.Sleep(5 * time.Second)
count++
}
if count >= 10 {
log.Fatalln("database locked")
Log.Fatal("database locked")
}
isWriting = true
}
func checkDbErr(err error, msg string) {
if err != nil {
log.Fatalln(msg, err)
Log.Fatal(msg, err)
}
}