b612/notify
1
0
Fork 0
Code Issues Pull Requests Projects Releases 7 Wiki Activity

sync support

Browse Source
This commit is contained in:
兔子 2020-12-21 17:31:03 +08:00
parent c9cfb6fd8a
commit 79dcaaf249
2 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client.go
View File

@ -27,6 +27,7 @@ type StarNotifyC struct {
// UseChannel 是否使用channel作为信息传递 // UseChannel 是否使用channel作为信息传递
UseChannel bool UseChannel bool
isUDP bool isUDP bool
Sync bool
// Queue 是用来处理收发信息的简单消息队列 // Queue 是用来处理收发信息的简单消息队列
Queue *starnet.StarQueue Queue *starnet.StarQueue
// Online 当前链接是否处于活跃状态 // Online 当前链接是否处于活跃状态
@ -281,10 +282,18 @@ func (star *StarNotifyC) cnotify() {
mode, key, value := strs[0], strs[1], strs[2] mode, key, value := strs[0], strs[1], strs[2]
if mode[0:2] != "cr" { if mode[0:2] != "cr" {
if msg, ok := star.FuncLists[key]; ok { if msg, ok := star.FuncLists[key]; ok {
go msg(CMsg{key, value, mode, nil}) if star.Sync {
msg(CMsg{key, value, mode, nil})
} else {
go msg(CMsg{key, value, mode, nil})
}
} else { } else {
if star.defaultFunc != nil { if star.defaultFunc != nil {
go star.defaultFunc(CMsg{key, value, mode, nil}) if star.Sync {
star.defaultFunc(CMsg{key, value, mode, nil})
} else {
go star.defaultFunc(CMsg{key, value, mode, nil})
}
} }
} }
} else { } else {
@ -296,10 +305,18 @@ func (star *StarNotifyC) cnotify() {
sa.wait <- 1 sa.wait <- 1
} else { } else {
if msg, ok := star.FuncLists[key]; ok { if msg, ok := star.FuncLists[key]; ok {
go msg(CMsg{key, value, mode, nil}) if star.Sync {
msg(CMsg{key, value, mode, nil})
} else {
go msg(CMsg{key, value, mode, nil})
}
} else { } else {
if star.defaultFunc != nil { if star.defaultFunc != nil {
go star.defaultFunc(CMsg{key, value, mode, nil}) if star.Sync {
star.defaultFunc(CMsg{key, value, mode, nil})
} else {
go star.defaultFunc(CMsg{key, value, mode, nil})
}
} }
} }
} }

54
server.go
View File

@ -49,6 +49,7 @@ type StarNotifyS struct {
udpPool map[string]*net.UDPAddr udpPool map[string]*net.UDPAddr
listener net.Listener listener net.Listener
isUDP bool isUDP bool
Sync bool
// Stop 停止信 号 // Stop 停止信 号
Stop chan int Stop chan int
// UDPConn UDP监听 // UDPConn UDP监听
@ -432,47 +433,40 @@ func (star *StarNotifyS) notify() {
continue continue
} }
} }
if mode[0:2] != "sr" { replyFunc := func(key string, rmsg SMsg) {
go func() { if msg, ok := star.FuncLists[key]; ok {
if msg, ok := star.FuncLists[key]; ok { sdata := msg(rmsg)
sdata := msg(rmsg) if sdata == "" {
return
}
rmsg.Reply(sdata)
} else {
if star.defaultFunc != nil {
sdata := star.defaultFunc(rmsg)
if sdata == "" { if sdata == "" {
return return
} }
rmsg.Reply(sdata) rmsg.Reply(sdata)
} else {
if star.defaultFunc != nil {
sdata := star.defaultFunc(rmsg)
if sdata == "" {
return
}
rmsg.Reply(sdata)
}
} }
}() }
}
if mode[0:2] != "sr" {
if star.Sync {
go replyFunc(key, rmsg)
} else {
replyFunc(key, rmsg)
}
} else { } else {
if sa, ok := star.lockPool[mode]; ok { if sa, ok := star.lockPool[mode]; ok {
rmsg.wait = sa.wait rmsg.wait = sa.wait
star.lockPool[mode] = rmsg star.lockPool[mode] = rmsg
star.lockPool[mode].wait <- 1 star.lockPool[mode].wait <- 1
} else { } else {
go func() { if star.Sync {
if msg, ok := star.FuncLists[key]; ok { go replyFunc(key, rmsg)
sdata := msg(rmsg) } else {
if sdata == "" { replyFunc(key, rmsg)
return }
}
rmsg.Reply(sdata)
} else {
if star.defaultFunc != nil {
sdata := star.defaultFunc(rmsg)
if sdata == "" {
return
}
rmsg.Reply(sdata)
}
}
}()
} }
} }
} }