oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-28 15:27:43 +00:00
Code Wiki Activity

Merge pull request #233 from riking/patch-3

Browse source 
Fix BunchedCommand replies
This commit is contained in:
Mike 2017-09-15 17:02:00 -04:00 • committed by GitHub
commit 76fca392a7
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
socketserver/server/commands.go
View file

@ -447,17 +447,18 @@ func C2SHandleBunchedCommand(conn *websocket.Conn, client *ClientInfo, msg Clien
client.MsgChannelKeepalive.Add(1) client.MsgChannelKeepalive.Add(1)
go func() { go func() {
result := <-resultCh result := <-resultCh
var msg ClientMessage var reply ClientMessage
if result.Err != nil { if result.Err != nil {
msg.Command = ErrorCommand reply.Command = ErrorCommand
msg.Arguments = result.Err.Error() reply.Arguments = result.Err.Error()
} else { } else {
msg.Command = SuccessCommand reply.Command = SuccessCommand
msg.origArguments = result.Val.(string) reply.MessageID = msg.MessageID
msg.parseOrigArguments() reply.origArguments = result.Val.(string)
reply.parseOrigArguments()
} }
client.Send(msg) client.Send(reply)
client.MsgChannelKeepalive.Done() client.MsgChannelKeepalive.Done()
}() }()