Skip to content

Commit 067fcac

Browse files
committed
fix: return actual server address by CLUSTER NODES
1 parent b5891af commit 067fcac

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

cmd_cluster.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ func (m *Miniredis) cmdClusterKeySlot(c *server.Peer, cmd string, args []string)
6262
// CLUSTER NODES
6363
func (m *Miniredis) cmdClusterNodes(c *server.Peer, cmd string, args []string) {
6464
withTx(m, c, func(c *server.Peer, ctx *connCtx) {
65-
c.WriteBulk("e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 127.0.0.1:7000@7000 myself,master - 0 0 1 connected 0-16383")
65+
// do not try to use m.Addr() here, as m is blocked by this tx.
66+
addr := m.srv.Addr()
67+
port := m.srv.Addr().Port
68+
c.WriteBulk(fmt.Sprintf("e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca %s@%d myself,master - 0 0 1 connected 0-16383", addr, port))
6669
})
6770
}

cmd_cluster_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package miniredis
22

33
import (
4+
"fmt"
45
"strconv"
56
"testing"
67

@@ -33,7 +34,7 @@ func TestCluster(t *testing.T) {
3334
t.Run("nodes", func(t *testing.T) {
3435
mustDo(t, c,
3536
"CLUSTER", "NODES",
36-
proto.String("e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 127.0.0.1:7000@7000 myself,master - 0 0 1 connected 0-16383"),
37+
proto.String(fmt.Sprintf("e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca %s:%s@%s myself,master - 0 0 1 connected 0-16383", s.Host(), s.Port(), s.Port())),
3738
)
3839
})
3940

0 commit comments

Comments
 (0)