diff --git a/examples/stan-bench.go b/examples/stan-bench.go index 763cfcb..30bdc66 100644 --- a/examples/stan-bench.go +++ b/examples/stan-bench.go @@ -14,6 +14,7 @@ import ( "github.com/nats-io/go-nats-streaming" "github.com/nats-io/nats" "github.com/nats-io/nats/bench" + ) // Some sane defaults @@ -35,7 +36,7 @@ func usage() { var benchmark *bench.Benchmark func main() { - var urls = flag.String("s", nats.DefaultURL, "The NATS server URLs (separated by comma)") + var urls = flag.String("s", nats.DefaultURL, "The NATS server URLs (separated by comma") var tls = flag.Bool("tls", false, "Use TLS secure sonnection") var numPubs = flag.Int("np", DefaultNumPubs, "Number of concurrent publishers") var numSubs = flag.Int("ns", DefaultNumSubs, "Number of concurrent subscribers") @@ -62,6 +63,7 @@ func main() { for i, s := range opts.Servers { opts.Servers[i] = strings.Trim(s, " ") } + opts.Secure = *tls benchmark = bench.NewBenchmark("NATS Streaming", *numSubs, *numPubs) @@ -103,8 +105,11 @@ func main() { } func runPublisher(startwg, donewg *sync.WaitGroup, opts nats.Options, numMsgs int, msgSize int, async bool, pubID string, maxPubAcksInflight int) { - - snc, err := stan.Connect("test-cluster", pubID, stan.MaxPubAcksInflight(maxPubAcksInflight)) + nc, err := opts.Connect() + if err != nil { + log.Fatalf("Publisher %s can't connect: %v\n", pubID, err) + } + snc, err := stan.Connect("test-cluster", pubID, stan.MaxPubAcksInflight(maxPubAcksInflight), stan.NatsConn(nc)) if err != nil { log.Fatalf("Publisher %s can't connect: %v\n", pubID, err) } @@ -148,11 +153,16 @@ func runPublisher(startwg, donewg *sync.WaitGroup, opts nats.Options, numMsgs in benchmark.AddPubSample(bench.NewSample(numMsgs, msgSize, start, time.Now(), snc.NatsConn())) snc.Close() + nc.Close() donewg.Done() } func runSubscriber(startwg, donewg *sync.WaitGroup, opts nats.Options, numMsgs int, msgSize int, ignoreOld bool, subID string) { - snc, err := stan.Connect("test-cluster", subID) + nc, err := opts.Connect() + if err != nil { + log.Fatalf("Subscriber %s can't connect: %v\n", subID, err) + } + snc, err := stan.Connect("test-cluster", subID, stan.NatsConn(nc)) if err != nil { log.Fatalf("Subscriber %s can't connect: %v\n", subID, err) } @@ -180,5 +190,6 @@ func runSubscriber(startwg, donewg *sync.WaitGroup, opts nats.Options, numMsgs i <-ch benchmark.AddSubSample(bench.NewSample(numMsgs, msgSize, start, time.Now(), snc.NatsConn())) snc.Close() + nc.Close() donewg.Done() }