Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-24 23:09:40 +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:
lifeiyi
2019-03-11 11:02:09 +08:00
parent f30eb8817b 44654e9bd0
commit 8dfbc16041
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
originnode/node.go
View File

@@ -96,6 +96,7 @@ func (s *COriginNode) Start() {
//停止运行程序 //停止运行程序
s.Stop() s.Stop()
service.GetLogger().Printf(sysmodule.LEVER_INFO, "Node stop run...")
} }
func (s *COriginNode) Stop() { func (s *COriginNode) Stop() {
@@ -113,6 +114,7 @@ func NewOrginNode() *COriginNode {
//安装系统服务 //安装系统服务
syslogservice := &sysservice.LogService{} syslogservice := &sysservice.LogService{}
syslogservice.InitLog("syslog", sysmodule.LEVER_INFO) syslogservice.InitLog("syslog", sysmodule.LEVER_INFO)
service.InstanceServiceMgr().Setup(syslogservice) service.InstanceServiceMgr().Setup(syslogservice)
//初始化集群对象 //初始化集群对象

16
sysmodule/DBModule.go
View File

@@ -296,7 +296,17 @@ func (slf *SyncDBResult) Get(timeoutMs int) DBResult {
// Query ... // Query ...
func (slf *DBModule) Query(query string, args ...interface{}) DBResult { func (slf *DBModule) Query(query string, args ...interface{}) DBResult {
if slf.db == nil {
ret := DBResult{}
service.GetLogger().Printf(service.LEVER_ERROR, "cannot connect database:%s", query)
ret.Err = fmt.Errorf("cannot connect database!")
return ret
}
rows, err := slf.db.Query(query, args...) rows, err := slf.db.Query(query, args...)
if err != nil {
service.GetLogger().Printf(service.LEVER_ERROR, "Query:%s(%v)", query, err)
}
return DBResult{ return DBResult{
Err: err, Err: err,
res: rows, res: rows,
@@ -331,12 +341,18 @@ func (slf *DBModule) SyncQuery(query string, args ...interface{}) SyncDBResult {
func (slf *DBModule) Exec(query string, args ...interface{}) DBResult { func (slf *DBModule) Exec(query string, args ...interface{}) DBResult {
ret := DBResult{} ret := DBResult{}
if slf.db == nil { if slf.db == nil {
service.GetLogger().Printf(service.LEVER_ERROR, "cannot connect database:%s", query)
ret.Err = fmt.Errorf("cannot connect database!") ret.Err = fmt.Errorf("cannot connect database!")
return ret return ret
} }
res, err := slf.db.Exec(query, args...) res, err := slf.db.Exec(query, args...)
ret.Err = err ret.Err = err
if err != nil {
service.GetLogger().Printf(service.LEVER_ERROR, "Exec:%s(%v)", query, err)
return ret
}
ret.LastInsertID, _ = res.LastInsertId() ret.LastInsertID, _ = res.LastInsertId()
ret.RowsAffected, _ = res.RowsAffected() ret.RowsAffected, _ = res.RowsAffected()
return ret return ret

5
sysservice/httpserverervice.go
View File

@@ -18,7 +18,8 @@ import (
) )
type HttpRequest struct { type HttpRequest struct {
Body string Header http.Header
Body string
} }
type HttpRespone struct { type HttpRespone struct {
@@ -111,7 +112,7 @@ func (slf *HttpServerService) httpHandler(w http.ResponseWriter, r *http.Request
} }
strCallPath := "_" + vstr[1] + ".HTTP_" + vstr[2] strCallPath := "_" + vstr[1] + ".HTTP_" + vstr[2]
request := HttpRequest{string(msg)} request := HttpRequest{r.Header, string(msg)}
var resp HttpRespone var resp HttpRespone
cluster.InstanceClusterMgr().Call(strCallPath, &request, &resp) cluster.InstanceClusterMgr().Call(strCallPath, &request, &resp)