From 9570ba882a13388a16d2980fd93da25fe27e7480 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 11 十月 2019 16:39:21 +0800
Subject: [PATCH] add log
---
dbself.go | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/dbself.go b/dbself.go
index 9755dfa..e40ea65 100644
--- a/dbself.go
+++ b/dbself.go
@@ -9,10 +9,13 @@
"strings"
"sync"
"github.com/jinzhu/gorm"
+ "basic.com/valib/logger.git"
)
const (
PersonSqliteDBPath = "~/workspace/gitblit/dbserver/config/testdb.db"
+ DbT_TableName = "dbtables"
+ DBP_TableName = "dbtablepersons"
)
var syncMut sync.Mutex
@@ -25,15 +28,15 @@
dbPath = PersonSqliteDBPath
}
- fmt.Println("self: ========>", dbPath)
+ logger.Info("self: ========>", dbPath)
db, err := New(dbPath, "", false)
if err != nil {
- fmt.Println("new db database: ", err)
+ logger.Error("new db database: ", err)
return err
}
dbConn, err := db.Connect()
if err != nil {
- fmt.Println("new db conn error; ", err)
+ logger.Error("new db conn error; ", err)
return err
}
@@ -46,21 +49,21 @@
path, err := getCurrentPath()
if err != nil {
- fmt.Println("getCurrentPath error; ", err)
+ logger.Error("getCurrentPath error; ", err)
return "", err
}
filepath := path + "tmp.db"
- fmt.Println("filepath:", filepath)
+ logger.Info("filepath:", filepath)
db, err := New(filepath, "", false)
if err != nil {
- fmt.Println("new db database: ", err)
+ logger.Error("new db database: ", err)
return "", err
}
tmpconn, err := db.Connect()
if err != nil {
- fmt.Println("new db conn error; ", err)
+ logger.Error("new db conn error; ", err)
return "", err
}
defer tmpconn.Close()
@@ -78,7 +81,7 @@
defer syncMut.Unlock()
allResults, err := SerfDbConn.Execute(sqlString, false, false)
if err != nil {
- fmt.Println("execute error!", err)
+ logger.Error("execute error!", err)
return nil, err
}
return allResults, nil
@@ -95,7 +98,7 @@
defer syncMut.Unlock()
rows, err := SerfDbConn.Query(sqlString, false, false)
if err != nil {
- fmt.Println("execute error!", err)
+ logger.Error("execute error!", err)
return nil, err
}
return rows, nil
@@ -116,11 +119,13 @@
result := tx.Exec(sql)
err = result.Error
if err !=nil {
- return false,result.Error
+ logger.Error("ExecuteSqlByGorm err:",err,",sql:",sql)
+ return false,err
}
- if result.RowsAffected == 0{
- fmt.Println("ExecuteSqlByGorm fail")
- return false,errors.New("ExecuteSqlByGorm fail")
+ if result.RowsAffected == 0 {
+ logger.Debug("ExecuteSqlByGorm RowsAffected == 0",",sql:",sql)
+ err = errors.New("ExecuteSqlByGorm RowsAffected == 0")
+ return false,err
}
}
tx.Commit()
@@ -156,7 +161,7 @@
if err !=nil {
return nil,errors.New("tableDesc err")
}
- fmt.Println(table,"'Columns is:",tDescArr)
+ logger.Info(table,"'Columns is:",tDescArr)
if tDescArr == nil || len(tDescArr) == 0 {
return nil,errors.New(table+" has no column")
}
@@ -164,12 +169,12 @@
for _,col :=range tDescArr {
columnNames = append(columnNames, fmt.Sprintf(`'||quote("%s")||'`, col.Name))
}
- if table == "dbTables" {
+ if table == DbT_TableName {
tSql = fmt.Sprintf(`SELECT 'INSERT INTO "%s" VALUES(%s)' as sql FROM "%s" where (analyServerId='' or analyServerId is NULL);`,
table,
strings.Join(columnNames, ","),
table)
- } else if table == "dbtablepersons" {
+ } else if table == DBP_TableName {
tSql = fmt.Sprintf(`SELECT 'INSERT INTO "%s" VALUES(%s)' as sql FROM "%s" where tableId in (select id from dbTables where (analyServerId='' or analyServerId is NULL));`,
table,
strings.Join(columnNames, ","),
@@ -181,7 +186,7 @@
table)
}
- fmt.Println("tSql:",tSql)
+ logger.Info("tSql:",tSql)
err = localDb.Raw(tSql).Scan(&dumpSql).Error
if err !=nil {
@@ -204,9 +209,9 @@
var b strings.Builder
if err := SerfDbConn.Dump(&b); err != nil {
- fmt.Println("dump file ", err.Error())
+ logger.Error("dump file ", err.Error())
}
- fmt.Printf("%T\n", b)
+ logger.Info("%T\n", b)
}
// get current path
--
Gitblit v1.8.0