From 3e45ff99414ab05ef86c9db662fb456706ab2fe2 Mon Sep 17 00:00:00 2001 From: jau1jz <95550641@163.com> Date: Tue, 2 Apr 2019 18:07:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9util=20map=E4=B8=AD=20ran?= =?UTF-8?q?ge=E5=87=BD=E6=95=B0=E9=BB=98=E8=AE=A4=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util/map.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/map.go b/util/map.go index c3d3b44..50d7bfc 100644 --- a/util/map.go +++ b/util/map.go @@ -85,7 +85,7 @@ func (m *Map) Len() int { return m.UnsafeLen() } -func (m *Map) UnsafeRange(f func(interface{}, interface{})) { +func (m *Map) UnsafeRange(f func(key interface{},value interface{})) { if m.m == nil { return } @@ -94,13 +94,13 @@ func (m *Map) UnsafeRange(f func(interface{}, interface{})) { } } -func (m *Map) RLockRange(f func(interface{}, interface{})) { +func (m *Map) RLockRange(f func(key interface{},value interface{})) { m.RLock() defer m.RUnlock() m.UnsafeRange(f) } -func (m *Map) LockRange(f func(interface{}, interface{})) { +func (m *Map) LockRange(f func(key interface{},value interface{})) { m.Lock() defer m.Unlock() m.UnsafeRange(f) From 49da76319f1838fdcad84f69f79e97aaf37caff7 Mon Sep 17 00:00:00 2001 From: lifeiyi <736926938@qq.com> Date: Wed, 3 Apr 2019 16:46:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?down=E6=9C=BA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cluster/cluster.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cluster/cluster.go b/cluster/cluster.go index 7e82315..e1295b4 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -230,6 +230,10 @@ func (slf *CCluster) Call(NodeServiceMethod string, args interface{}, reply inte if nodeid == GetNodeId() { //判断服务是否已经完成初始化 iService := service.InstanceServiceMgr().FindService(serviceName) + if iService == nil { + service.GetLogger().Printf(sysmodule.LEVER_ERROR, "CCluster.Call(%s): NodeId %d cannot find.", NodeServiceMethod, nodeid) + return fmt.Errorf("CCluster.Call(%s): NodeId %d cannot find..", NodeServiceMethod, nodeid) + } if iService.IsInit() == false { service.GetLogger().Printf(sysmodule.LEVER_ERROR, "CCluster.Call(%s): NodeId %d is not init.", NodeServiceMethod, nodeid) return fmt.Errorf("CCluster.Call(%s): NodeId %d is not init.", NodeServiceMethod, nodeid)