提交 dd40a5a2 作者: Jeromy

fix pubsub pub reading stdin args

License: MIT
Signed-off-by: 's avatarJeromy <jeromyj@gmail.com>
上级 bea666f3
...@@ -223,6 +223,12 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. ...@@ -223,6 +223,12 @@ To use, the daemon must be run with '--enable-pubsub-experiment'.
topic := req.Arguments[0] topic := req.Arguments[0]
err = req.ParseBodyArgs()
if err != nil && !cmds.IsAllArgsAlreadyCovered(err) {
res.SetError(err, cmdkit.ErrNormal)
return
}
for _, data := range req.Arguments[1:] { for _, data := range req.Arguments[1:] {
if err := n.Floodsub.Publish(topic, []byte(data)); err != nil { if err := n.Floodsub.Publish(topic, []byte(data)); err != nil {
res.SetError(err, cmdkit.ErrNormal) res.SetError(err, cmdkit.ErrNormal)
......
...@@ -35,7 +35,7 @@ test_expect_success 'pubsub' ' ...@@ -35,7 +35,7 @@ test_expect_success 'pubsub' '
' '
test_expect_success "wait until ipfs pubsub sub is ready to do work" ' test_expect_success "wait until ipfs pubsub sub is ready to do work" '
sleep 1 go-sleep 500ms
' '
test_expect_success "can see peer subscribed to testTopic" ' test_expect_success "can see peer subscribed to testTopic" '
...@@ -57,6 +57,36 @@ test_expect_success "wait until echo > wait executed" ' ...@@ -57,6 +57,36 @@ test_expect_success "wait until echo > wait executed" '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "wait for another pubsub message" '
echo "testOK2" > expected &&
mkfifo wait2 ||
test_fsh echo init fail
# ipfs pubsub sub is long-running so we need to start it in the background and
# wait put its output somewhere where we can access it
(
ipfsi 2 pubsub sub --enc=ndpayload testTopic | if read line; then
echo $line > actual &&
echo > wait2
fi
) &
'
test_expect_success "wait until ipfs pubsub sub is ready to do work" '
go-sleep 500ms
'
test_expect_success "publish something" '
echo "testOK2" | ipfsi 1 pubsub pub testTopic &> pubErr
'
test_expect_success "wait until echo > wait executed" '
echo "testOK2" > expected &&
cat wait2 &&
test_cmp pubErr empty &&
test_cmp expected actual
'
test_expect_success 'stop iptb' ' test_expect_success 'stop iptb' '
iptb stop iptb stop
' '
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论