Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-05-13 02:17:35 +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:
boyce
2019-04-04 20:26:10 +08:00
parent b0cdc46920 49da76319f
commit f45e60ff49
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/cluster.go
View File

@@ -230,6 +230,10 @@ func (slf *CCluster) Call(NodeServiceMethod string, args interface{}, reply inte
if nodeid == GetNodeId() { if nodeid == GetNodeId() {
//判断服务是否已经完成初始化 //判断服务是否已经完成初始化
iService := service.InstanceServiceMgr().FindService(serviceName) 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 { if iService.IsInit() == false {
service.GetLogger().Printf(sysmodule.LEVER_ERROR, "CCluster.Call(%s): NodeId %d is not init.", NodeServiceMethod, nodeid) 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) return fmt.Errorf("CCluster.Call(%s): NodeId %d is not init.", NodeServiceMethod, nodeid)

6
util/map.go
View File

@@ -85,7 +85,7 @@ func (m *Map) Len() int {
return m.UnsafeLen() 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 { if m.m == nil {
return 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() m.RLock()
defer m.RUnlock() defer m.RUnlock()
m.UnsafeRange(f) m.UnsafeRange(f)
} }
func (m *Map) LockRange(f func(interface{}, interface{})) { func (m *Map) LockRange(f func(key interface{},value interface{})) {
m.Lock() m.Lock()
defer m.Unlock() defer m.Unlock()
m.UnsafeRange(f) m.UnsafeRange(f)