Commit 2a5b3323 authored by jingbo.wang's avatar jingbo.wang

panic bug修改

parent 87b9e40f
...@@ -46,7 +46,7 @@ func msgInfluxProcess(traceMsgs []end_points.TraceMsg) { ...@@ -46,7 +46,7 @@ func msgInfluxProcess(traceMsgs []end_points.TraceMsg) {
} }
path := traceMsg.Name path := traceMsg.Name
if _, ok := httpMethod[path]; ok { if _, ok := httpMethod[path]; ok {
path = traceMsg.Tags.HttpMethod + " " + path path = traceMsg.Tags.HttpMethod + " " + traceMsg.Tags.HttpPath
} }
path = strings.ToLower(path) path = strings.ToLower(path)
......
...@@ -131,11 +131,12 @@ func (w watch) UpdateNodes(service *registry.Service) { ...@@ -131,11 +131,12 @@ func (w watch) UpdateNodes(service *registry.Service) {
newService := registry.NewService(service.Name) newService := registry.NewService(service.Name)
for kk, vv := range service.NodeMap { for kk, vv := range service.NodeMap {
newNode := registry.Node{ newNode := registry.Node{
ServiceName:vv.ServiceName, ServiceName: vv.ServiceName,
Id:vv.Id, Id: vv.Id,
Port:vv.Port, Port: vv.Port,
Address:vv.Address, Address: vv.Address,
Status:vv.Status, Status: vv.Status,
Meta: make(map[string]string),
} }
for x, y := range vv.Meta { for x, y := range vv.Meta {
newNode.Meta[x] = y newNode.Meta[x] = y
...@@ -155,7 +156,7 @@ func (w watch) DelNode(node *registry.Node) { ...@@ -155,7 +156,7 @@ func (w watch) DelNode(node *registry.Node) {
} }
var ( var (
servicesStatus = make(map[string]*registry.Service) servicesStatus = make(map[string]*registry.Service)
servicesStatusLock = new(sync.Mutex) servicesStatusLock = new(sync.Mutex)
) )
...@@ -165,12 +166,14 @@ func InitServiceStatus() { ...@@ -165,12 +166,14 @@ func InitServiceStatus() {
func NodeCheck() { func NodeCheck() {
defer func() { defer func() {
if e := recover(); e != nil { /*
logger.Info("node check panic: ", e) if e := recover(); e != nil {
_ = ding.SendText("node check panic!", dingding.DefaultDingURL...) logger.Error("node check panic: ", e)
time.Sleep(time.Second * 1) _ = ding.SendText("node check panic!", dingding.DefaultDingURL...)
NodeCheck() time.Sleep(time.Second * 1)
} NodeCheck()
}
*/
}() }()
//注册器初始化 //注册器初始化
......
...@@ -301,6 +301,7 @@ func (cr *consulRegistry) SetObserver(name string, observer Observer) error { ...@@ -301,6 +301,7 @@ func (cr *consulRegistry) SetObserver(name string, observer Observer) error {
Port:vv.Port, Port:vv.Port,
Address:vv.Address, Address:vv.Address,
Status:vv.Status, Status:vv.Status,
Meta: make(map[string]string),
} }
for x, y := range vv.Meta { for x, y := range vv.Meta {
newNode.Meta[x] = y newNode.Meta[x] = y
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment