Better option handling for TLS connections

mjdusa · Jan 17, 2016 · 90f704d · 90f704d
1 parent 565ebc4
commit 90f704d
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 96 deletions.
diff --git a/example_test.go b/example_test.go
@@ -13,7 +13,10 @@ func ExampleConnect() {
 	nc, _ := nats.Connect(nats.DefaultURL)
 	nc.Close()
 
-	nc, _ = nats.Connect("nats://derek:secretpassword@nats.apcera.com:4222")
+	nc, _ = nats.Connect("nats://derek:secretpassword@demo.nats.io:4222")
+	nc.Close()
+
+	nc, _ = nats.Connect("tls://derek:secretpassword@demo.nats.io:4443")
 	nc.Close()
 
 	opts := nats.Options{

diff --git a/examples/nats-pub.go b/examples/nats-pub.go
@@ -1,23 +1,22 @@
-// Copyright 2012-2015 Apcera Inc. All rights reserved.
+// Copyright 2012-2016 Apcera Inc. All rights reserved.
 // +build ignore
 
 package main
 
 import (
 	"flag"
 	"log"
-	"strings"
 
 	"github.com/nats-io/nats"
 )
 
+// NOTE: Use tls scheme for TLS, e.g. nats-pub -s tls://demo.nats.io:4443 foo hello
 func usage() {
-	log.Fatalf("Usage: nats-pub [-s server (%s)] [--tls] <subject> <msg> \n", nats.DefaultURL)
+	log.Fatalf("Usage: nats-pub [-s server (%s)] <subject> <msg> \n", nats.DefaultURL)
 }
 
 func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
-	var tls = flag.Bool("tls", false, "Use TLS Secure Connection")
 
 	log.SetFlags(0)
 	flag.Usage = usage
@@ -28,17 +27,9 @@ func main() {
 		usage()
 	}
 
-	opts := nats.DefaultOptions
-	opts.Servers = strings.Split(*urls, ",")
-	for i, s := range opts.Servers {
-		opts.Servers[i] = strings.Trim(s, " ")
-	}
-
-	opts.Secure = *tls
-
-	nc, err := opts.Connect()
+	nc, err := nats.Connect(*urls)
 	if err != nil {
-		log.Fatalf("Can't connect: %v\n", err)
+		log.Fatal(err)
 	}
 	defer nc.Close()
 

diff --git a/examples/nats-qsub.go b/examples/nats-qsub.go
@@ -1,4 +1,4 @@
-// Copyright 2012-2015 Apcera Inc. All rights reserved.
+// Copyright 2012-2016 Apcera Inc. All rights reserved.
 // +build ignore
 
 package main
@@ -8,13 +8,13 @@ import (
 	"log"
 	"os"
 	"runtime"
-	"strings"
 
 	"github.com/nats-io/nats"
 )
 
+// NOTE: Use tls scheme for TLS, e.g. nats-qsub -s tls://demo.nats.io:4443 foo
 func usage() {
-	log.Fatalf("Usage: nats-sub [-s server] [--tls] [-t] <subject> <queue-group>\n")
+	log.Fatalf("Usage: nats-sub [-s server] [-t] <subject> <queue-group>\n")
 }
 
 func printMsg(m *nats.Msg, i int) {
@@ -24,7 +24,6 @@ func printMsg(m *nats.Msg, i int) {
 func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var showTime = flag.Bool("t", false, "Display timestamps")
-	var tls = flag.Bool("tls", false, "Use Secure Connection")
 
 	log.SetFlags(0)
 	flag.Usage = usage
@@ -35,14 +34,7 @@ func main() {
 		usage()
 	}
 
-	opts := nats.DefaultOptions
-	opts.Servers = strings.Split(*urls, ",")
-	for i, s := range opts.Servers {
-		opts.Servers[i] = strings.Trim(s, " ")
-	}
-	opts.Secure = *tls
-
-	nc, err := opts.Connect()
+	nc, err := nats.Connect(*urls)
 	if err != nil {
 		log.Fatalf("Can't connect: %v\n", err)
 	}

diff --git a/examples/nats-req.go b/examples/nats-req.go
@@ -1,24 +1,23 @@
-// Copyright 2012-2015 Apcera Inc. All rights reserved.
+// Copyright 2012-2016 Apcera Inc. All rights reserved.
 // +build ignore
 
 package main
 
 import (
 	"flag"
 	"log"
-	"strings"
 	"time"
 
 	"github.com/nats-io/nats"
 )
 
+// NOTE: Use tls scheme for TLS, e.g. nats-req -s tls://demo.nats.io:4443 foo hello
 func usage() {
-	log.Fatalf("Usage: nats-req [-s server (%s)] [--tls] <subject> <msg> \n", nats.DefaultURL)
+	log.Fatalf("Usage: nats-req [-s server (%s)] <subject> <msg> \n", nats.DefaultURL)
 }
 
 func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
-	var tls = flag.Bool("tls", false, "Use Secure Connection")
 
 	log.SetFlags(0)
 	flag.Usage = usage
@@ -29,15 +28,7 @@ func main() {
 		usage()
 	}
 
-	opts := nats.DefaultOptions
-	opts.Servers = strings.Split(*urls, ",")
-	for i, s := range opts.Servers {
-		opts.Servers[i] = strings.Trim(s, " ")
-	}
-
-	opts.Secure = *tls
-
-	nc, err := opts.Connect()
+	nc, err := nats.Connect(*urls)
 	if err != nil {
 		log.Fatalf("Can't connect: %v\n", err)
 	}

diff --git a/examples/nats-rply.go b/examples/nats-rply.go
@@ -1,4 +1,4 @@
-// Copyright 2012-2015 Apcera Inc. All rights reserved.
+// Copyright 2012-2016 Apcera Inc. All rights reserved.
 // +build ignore
 
 package main
@@ -7,13 +7,13 @@ import (
 	"flag"
 	"log"
 	"runtime"
-	"strings"
 
 	"github.com/nats-io/nats"
 )
 
+// NOTE: Use tls scheme for TLS, e.g. nats-rply -s tls://demo.nats.io:4443 foo hello
 func usage() {
-	log.Fatalf("Usage: nats-rply [-s server] [--tls] [-t] <subject> <reponse>\n")
+	log.Fatalf("Usage: nats-rply [-s server][-t] <subject> <reponse>\n")
 }
 
 func printMsg(m *nats.Msg, i int) {
@@ -23,7 +23,6 @@ func printMsg(m *nats.Msg, i int) {
 func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var showTime = flag.Bool("t", false, "Display timestamps")
-	var tls = flag.Bool("tls", false, "Use Secure Connection")
 
 	log.SetFlags(0)
 	flag.Usage = usage
@@ -34,14 +33,7 @@ func main() {
 		usage()
 	}
 
-	opts := nats.DefaultOptions
-	opts.Servers = strings.Split(*urls, ",")
-	for i, s := range opts.Servers {
-		opts.Servers[i] = strings.Trim(s, " ")
-	}
-	opts.Secure = *tls
-
-	nc, err := opts.Connect()
+	nc, err := nats.Connect(*urls)
 	if err != nil {
 		log.Fatalf("Can't connect: %v\n", err)
 	}

diff --git a/examples/nats-sub.go b/examples/nats-sub.go
@@ -1,4 +1,4 @@
-// Copyright 2012-2015 Apcera Inc. All rights reserved.
+// Copyright 2012-2016 Apcera Inc. All rights reserved.
 // +build ignore
 
 package main
@@ -7,13 +7,13 @@ import (
 	"flag"
 	"log"
 	"runtime"
-	"strings"
 
 	"github.com/nats-io/nats"
 )
 
+// NOTE: Use tls scheme for TLS, e.g. nats-sub -s tls://demo.nats.io:4443 foo
 func usage() {
-	log.Fatalf("Usage: nats-sub [-s server] [--tls] [-t] <subject> \n")
+	log.Fatalf("Usage: nats-sub [-s server] [-t] <subject> \n")
 }
 
 func printMsg(m *nats.Msg, i int) {
@@ -23,7 +23,6 @@ func printMsg(m *nats.Msg, i int) {
 func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var showTime = flag.Bool("t", false, "Display timestamps")
-	var tls = flag.Bool("tls", false, "Use Secure Connection")
 
 	log.SetFlags(0)
 	flag.Usage = usage
@@ -34,14 +33,7 @@ func main() {
 		usage()
 	}
 
-	opts := nats.DefaultOptions
-	opts.Servers = strings.Split(*urls, ",")
-	for i, s := range opts.Servers {
-		opts.Servers[i] = strings.Trim(s, " ")
-	}
-	opts.Secure = *tls
-
-	nc, err := opts.Connect()
+	nc, err := nats.Connect(*urls)
 	if err != nil {
 		log.Fatalf("Can't connect: %v\n", err)
 	}