Merge branch 'cmdargs'

* cmdargs: update example fix brokeraddr arg
travisjeffery · Feb 10, 2017 · b2996a6 · b2996a6
2 parents 0d9e74b + 3a9bad8
commit b2996a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/cmd/jocko/main.go b/cmd/jocko/main.go
@@ -15,7 +15,7 @@ import (
 var (
 	logDir      = kingpin.Flag("logdir", "A comma separated list of directories under which to store log files").Default("/tmp/jocko").String()
 	raftAddr    = kingpin.Flag("raftaddr", "Address for Raft to bind and advertise on").Default("127.0.0.1:9093").String()
-	brokerAddr  = kingpin.Flag("serveraddr", "Address for Broker to bind on").Default("0.0.0.0:9092").String()
+	brokerAddr  = kingpin.Flag("brokeraddr", "Address for Broker to bind on").Default("0.0.0.0:9092").String()
 	serfAddr    = kingpin.Flag("serfaddr", "Address for Serf to bind on").Default("0.0.0.0:9094").String()
 	serfMembers = kingpin.Flag("serfmembers", "List of existing Serf members").Strings()
 	brokerID    = kingpin.Flag("id", "Broker ID").Int32()

diff --git a/examples/cluster/README.md b/examples/cluster/README.md
@@ -15,30 +15,24 @@ $ go build
 ```bash
 $ ./jocko --debug \
           --logdir="/tmp/jocko1" \
-          --tcpaddr=127.0.0.1:9001 \
-          --raftdir="/tmp/jocko1/raft" \
-          --raftaddr=127.0.0.1 \
-          --raftport=8001 \
-          --serfport=7946 \
+          --brokeraddr=127.0.0.1:9001 \
+          --raftaddr=127.0.0.1:9002 \
+          --serfaddr=127.0.0.1:9003 \
           --id=1
-          
+
 $ ./jocko --debug \
           --logdir="/tmp/jocko2" \
-          --tcpaddr=127.0.0.1:9002 \
-          --raftdir="/tmp/jocko2/raft" \
-          --raftaddr=127.0.0.1 \
-          --raftport=8002 \
-          --serfport=7947 \
-          --serfmembers=127.0.0.1:7946 \
+          --brokeraddr=127.0.0.1:9101 \
+          --raftaddr=127.0.0.1:9102 \
+          --serfaddr=127.0.0.1:9103 \
+          --serfmembers=127.0.0.1:9003 \
           --id=2
-          
+
 $ ./jocko --debug \
           --logdir="/tmp/jocko3" \
-          --tcpaddr=127.0.0.1:9003 \
-          --raftdir="/tmp/jocko3/raft" \
-          --raftaddr=127.0.0.1 \
-          --raftport=8003 \
-          --serfport=7948 \
-          --serfmembers=127.0.0.1:7946 \
+          --brokeraddr=127.0.0.1:9201 \
+          --raftaddr=127.0.0.1:9202 \
+          --serfaddr=127.0.0.1:9203 \
+          --serfmembers=127.0.0.1:9003 \
           --id=3
 ```