From 3ef4a65ce89920ebb58126956f39b3ddb3bd2f31 Mon Sep 17 00:00:00 2001
From: Matt Reiferson <mreiferson@gmail.com>
Date: Tue, 9 Sep 2014 17:22:58 -0400
Subject: [PATCH] nsqlookupd: don't parse addresses up front

---
 nsqlookupd/nsqlookupd.go      | 26 ++++----------------------
 nsqlookupd/nsqlookupd_test.go |  8 ++------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/nsqlookupd/nsqlookupd.go b/nsqlookupd/nsqlookupd.go
index 94ecd2053..81256e115 100644
--- a/nsqlookupd/nsqlookupd.go
+++ b/nsqlookupd/nsqlookupd.go
@@ -15,8 +15,6 @@ import (
 type NSQLookupd struct {
 	sync.RWMutex
 	opts         *nsqlookupdOptions
-	tcpAddr      *net.TCPAddr
-	httpAddr     *net.TCPAddr
 	tcpListener  net.Listener
 	httpListener net.Listener
 	waitGroup    util.WaitGroupWrapper
@@ -28,23 +26,7 @@ func NewNSQLookupd(opts *nsqlookupdOptions) *NSQLookupd {
 		opts: opts,
 		DB:   NewRegistrationDB(),
 	}
-
-	tcpAddr, err := net.ResolveTCPAddr("tcp", opts.TCPAddress)
-	if err != nil {
-		n.logf("FATAL: failed to resolve TCP address (%s) - %s", opts.TCPAddress, err)
-		os.Exit(1)
-	}
-	n.tcpAddr = tcpAddr
-
-	httpAddr, err := net.ResolveTCPAddr("tcp", opts.HTTPAddress)
-	if err != nil {
-		n.logf("FATAL: failed to resolve HTTP address (%s) - %s", opts.HTTPAddress, err)
-		os.Exit(1)
-	}
-	n.httpAddr = httpAddr
-
 	n.logf(version.String("nsqlookupd"))
-
 	return n
 }
 
@@ -58,9 +40,9 @@ func (l *NSQLookupd) logf(f string, args ...interface{}) {
 func (l *NSQLookupd) Main() {
 	ctx := &Context{l}
 
-	tcpListener, err := net.Listen("tcp", l.tcpAddr.String())
+	tcpListener, err := net.Listen("tcp", l.opts.TCPAddress)
 	if err != nil {
-		l.logf("FATAL: listen (%s) failed - %s", l.tcpAddr, err)
+		l.logf("FATAL: listen (%s) failed - %s", l.opts.TCPAddress, err)
 		os.Exit(1)
 	}
 	l.Lock()
@@ -71,9 +53,9 @@ func (l *NSQLookupd) Main() {
 		protocol.TCPServer(tcpListener, tcpServer, l.opts.Logger)
 	})
 
-	httpListener, err := net.Listen("tcp", l.httpAddr.String())
+	httpListener, err := net.Listen("tcp", l.opts.HTTPAddress)
 	if err != nil {
-		l.logf("FATAL: listen (%s) failed - %s", l.httpAddr, err)
+		l.logf("FATAL: listen (%s) failed - %s", l.opts.HTTPAddress, err)
 		os.Exit(1)
 	}
 	l.Lock()
diff --git a/nsqlookupd/nsqlookupd_test.go b/nsqlookupd/nsqlookupd_test.go
index 44f06736b..ea27bc090 100644
--- a/nsqlookupd/nsqlookupd_test.go
+++ b/nsqlookupd/nsqlookupd_test.go
@@ -41,14 +41,10 @@ func newTestLogger(tbl tbLog) logger {
 }
 
 func mustStartLookupd(opts *nsqlookupdOptions) (*net.TCPAddr, *net.TCPAddr, *NSQLookupd) {
-	tcpAddr, _ := net.ResolveTCPAddr("tcp", "127.0.0.1:0")
-	httpAddr, _ := net.ResolveTCPAddr("tcp", "127.0.0.1:0")
-
+	opts.TCPAddress = "127.0.0.1:0"
+	opts.HTTPAddress = "127.0.0.1:0"
 	nsqlookupd := NewNSQLookupd(opts)
-	nsqlookupd.tcpAddr = tcpAddr
-	nsqlookupd.httpAddr = httpAddr
 	nsqlookupd.Main()
-
 	return nsqlookupd.tcpListener.Addr().(*net.TCPAddr),
 		nsqlookupd.httpListener.Addr().(*net.TCPAddr),
 		nsqlookupd