Merge branch 'develop' into develop

This commit is contained in:
暗音
2019-10-28 11:06:13 +08:00
committed by GitHub
18 changed files with 364 additions and 228 deletions

View File

@@ -3,6 +3,7 @@ package msg_handler
import (
"crawlab/constants"
"crawlab/entity"
"github.com/apex/log"
)
type Handler interface {
@@ -10,6 +11,7 @@ type Handler interface {
}
func GetMsgHandler(msg entity.NodeMessage) Handler {
log.Infof("received msg , type is : %s", msg.Type)
if msg.Type == constants.MsgTypeGetLog || msg.Type == constants.MsgTypeRemoveLog {
// 日志相关
return &Log{

View File

@@ -40,9 +40,12 @@ func (g *Log) get() error {
msgSd.Log = utils.BytesToString(logStr)
}
// 发布消息给主节点
if err := database.Pub(constants.ChannelMasterNode, msgSd); err != nil {
if err := utils.Pub(constants.ChannelMasterNode, msgSd); err != nil {
log.Errorf("pub log to master node error: %s", err.Error())
debug.PrintStack()
return err
}
log.Infof(msgSd.Log)
return nil
}