mirror
/
tile38
mirror of https://github.com/tidwall/tile38.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gojuno-master'

This commit is contained in:
Josh Baker 2017-02-09 09:12:57 -07:00
parent 6f5bb459e1 237d4b2284
commit 9a37f33a2c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
controller/fence.go
View File

@ -150,12 +150,12 @@ func fenceMatch(hookName string, sw *scanWriter, fence *liveFenceSwitches, metas
sw.fullFields = true
sw.msg.OutputType = server.JSON
sw.writeObject(ScanWriterParams{
id:details.id,
o: details.obj,
id: details.id,
o: details.obj,
fields: details.fields,
noLock: true,
})
if sw.wr.Len() == 0 {
sw.mu.Unlock()
return nil
@ -194,10 +194,13 @@ func fenceMatch(hookName string, sw *scanWriter, fence *liveFenceSwitches, metas
msgs := make([][]byte, 0, 4)
if fence.detect == nil || fence.detect[detect] {
if len(res) > 0 && res[0] == '{' {
res = makemsg(details.command, group, detect, hookName, metas, details.key, details.timestamp, res[1:])
if fence.detect == nil || fence.detect[detect] {
if len(res) > 0 && res[0] == '{' {
msgs = append(msgs, makemsg(details.command, group, detect, hookName, metas, details.key, details.timestamp, res[1:]))
} else {
msgs = append(msgs, res)
}
}
msgs = append(msgs, res)
}
switch detect {
case "enter":