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

originnode/node.go

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

sysmodule/DBModule.go

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

sysservice/httpserverervice.go

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