Send empty struct to pubsub cmd output to flush #3416
Conversation
| n := binary.PutUvarint(buf, uint64(len(m.Data))) | ||
| return io.MultiReader(bytes.NewReader(buf[:n]), bytes.NewReader(m.Data)), nil | ||
| var ( | ||
| n int |
There was a problem hiding this comment.
I dislike this syntax, lets just instantiate things where they are used.
Also, no need for the m.Message != nil check, its functionally equivalent to just saying data := m.Message
There was a problem hiding this comment.
The idea here is that data is nil if m.Message is nil.
| @@ -118,16 +122,33 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. | |||
| }, | |||
| Marshalers: cmds.MarshalerMap{ | |||
| cmds.Text: getPsMsgMarshaler(func(m *floodsub.Message) (io.Reader, error) { | |||
| if m.Message == nil { | |||
There was a problem hiding this comment.
You can leave this out too, passing a nil byte array to a bytes.NewReader will result in the same as passing the empty string to a stringsreader
There was a problem hiding this comment.
No I can't. We use m.Data later, which is m.Message.Data, which is a nil dereference.
There was a problem hiding this comment.
If m.Message is nil, what is the value of m.Data ?
There was a problem hiding this comment.
Message is embedded and Data is part of Message.
There was a problem hiding this comment.
and if m.Message is nil, m.Message.Data panics - so does m.Data
| return bytes.NewReader(m.Data), nil | ||
| }), | ||
| "ndpayload": getPsMsgMarshaler(func(m *floodsub.Message) (io.Reader, error) { | ||
| if m.Message == nil { |
There was a problem hiding this comment.
Same here, append([]byte(nil), '\n') works just fine
There was a problem hiding this comment.
And where would I store that? m.Data does not exist because it is actually m.Message.Data, and m.Message is nil. Panic!
|
Oh and |
So the HTTP headers get sent License: MIT Signed-off-by: Jan Winkelmann <j-winkelmann@tuhh.de>
keks
force-pushed
the
feat/instaflush
branch
from
47cb7d1
to
7ad2f52
Compare
|
@keks sorry about that, I missed the fact that there was an embedded struct involved. |
|
I endorse this PR and/or service. Would be awesome to get this into 0.4.5-rc1 build. |
|
@whyrusleeping can you merge? I'll look at sharness tests next week. |
ghost
mentioned this pull request
So the HTTP headers get sent