3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-22 20:09:41 +01:00

A labeled command that has 0 response lines should receive an empty batch

See discussion on #391.
This commit is contained in:
Shivaram Lingamneni 2019-02-20 21:40:25 -05:00
parent 234d011c29
commit bbd99b655a

View File

@ -142,10 +142,10 @@ func (rb *ResponseBuffer) flushInternal(final bool, blocking bool) error {
} }
useLabel := rb.target.capabilities.Has(caps.LabeledResponse) && rb.Label != "" useLabel := rb.target.capabilities.Has(caps.LabeledResponse) && rb.Label != ""
// use a batch if we have a label, and we either currently have multiple messages, // use a batch if we have a label, and we either currently have 0 or 2+ messages,
// or we are doing a Flush() and we have to assume that there will be more messages // or we are doing a Flush() and we have to assume that there will be more messages
// in the future. // in the future.
useBatch := useLabel && (len(rb.messages) > 1 || !final) useBatch := useLabel && (len(rb.messages) != 1 || !final)
// if label but no batch, add label to first message // if label but no batch, add label to first message
if useLabel && !useBatch && len(rb.messages) == 1 && rb.batchID == "" { if useLabel && !useBatch && len(rb.messages) == 1 && rb.batchID == "" {