Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-23 22:04:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/duanhf2012/origin

Browse Source
This commit is contained in:
Ally Dale
2019-08-14 11:12:08 +08:00
parent 2b93e2c16d 9ac15d0e32
commit 8f9c39222a
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sysmodule/DBModule.go
View File

@@ -76,6 +76,14 @@ type SyncExecuteDBResult struct {
err chan error err chan error
} }
func (slf *DBModule) OnRun() bool {
if slf.db != nil {
slf.db.Ping()
}
time.Sleep(time.Second * 5)
return true
}
func (slf *DBModule) Init(maxConn int, url string, userName string, password string, dbname string) error { func (slf *DBModule) Init(maxConn int, url string, userName string, password string, dbname string) error {
slf.url = url slf.url = url
slf.maxconn = maxConn slf.maxconn = maxConn
@@ -281,7 +289,7 @@ func (slf *DBResult) mapSlice2interface(data []map[string]string, in interface{}
// Connect ... // Connect ...
func (slf *DBModule) Connect(maxConn int) error { func (slf *DBModule) Connect(maxConn int) error {
cmd := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8&parseTime=true&loc=%s", cmd := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8&parseTime=true&loc=%s&readTimeout=30s&timeout=15s&writeTimeout=30s",
slf.username, slf.username,
slf.password, slf.password,
slf.url, slf.url,
@@ -292,7 +300,6 @@ func (slf *DBModule) Connect(maxConn int) error {
if err != nil { if err != nil {
return err return err
} }
err = db.Ping() err = db.Ping()
if err != nil { if err != nil {
db.Close() db.Close()
@@ -467,7 +474,11 @@ func (slf *DBModule) QueryEx(query string, args ...interface{}) (*DataSetList, e
datasetList.dataSetList = append(datasetList.dataSetList, dbResult) datasetList.dataSetList = append(datasetList.dataSetList, dbResult)
//取下一个结果集 //取下一个结果集
hasRet := rows.NextResultSet() hasRet := rows.NextResultSet()
if hasRet == false { if hasRet == false {
if rows.Err()!= nil {
service.GetLogger().Printf(service.LEVER_ERROR, "Query:%s(%+v)", query, rows)
}
break break
} }
} }