From 547c9e7f5a2010bdc4e6384d01c82a57902b8680 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Tue, 22 Sep 2015 13:34:25 +0100
Subject: [PATCH] Removing confusing variable from getDNSDomain, just return ""
 when disabled

---
 proxy/create_container_interceptor.go |  2 +-
 proxy/proxy.go                        | 12 +++++++-----
 proxy/start_container_interceptor.go  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/proxy/create_container_interceptor.go b/proxy/create_container_interceptor.go
index 70e0198f..d40efaff 100644
--- a/proxy/create_container_interceptor.go
+++ b/proxy/create_container_interceptor.go
@@ -61,7 +61,7 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error {
 			}
 		}
 		hostname = i.proxy.hostnameMatchRegexp.ReplaceAllString(hostname, i.proxy.HostnameReplacement)
-		if dnsDomain, withDNS := i.proxy.getDNSDomain(); withDNS {
+		if dnsDomain := i.proxy.getDNSDomain(); dnsDomain != "" {
 			i.setHostname(&container, hostname, dnsDomain)
 			if err := i.proxy.setWeaveDNS(container.HostConfig, container.Hostname, dnsDomain); err != nil {
 				return err
diff --git a/proxy/proxy.go b/proxy/proxy.go
index 89c4a59d..e6ca9599 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -395,13 +395,15 @@ func (proxy *Proxy) setWeaveDNS(hostConfig *docker.HostConfig, hostname, dnsDoma
 	return nil
 }
 
-func (proxy *Proxy) getDNSDomain() (domain string, running bool) {
+func (proxy *Proxy) getDNSDomain() (domain string) {
 	if proxy.WithoutDNS {
-		return "", false
+		return ""
+	}
+
+	if proxy.WithDNS {
+		domain = nameserver.DefaultDomain
 	}
 
-	domain = nameserver.DefaultDomain
-	running = proxy.WithDNS
 	weaveContainer, err := proxy.client.InspectContainer("weave")
 	if err != nil ||
 		weaveContainer.NetworkSettings == nil ||
@@ -421,5 +423,5 @@ func (proxy *Proxy) getDNSDomain() (domain string, running bool) {
 		return
 	}
 
-	return string(b), true
+	return string(b)
 }
diff --git a/proxy/start_container_interceptor.go b/proxy/start_container_interceptor.go
index 56a482e2..019ac8cd 100644
--- a/proxy/start_container_interceptor.go
+++ b/proxy/start_container_interceptor.go
@@ -29,7 +29,7 @@ func (i *startContainerInterceptor) InterceptRequest(r *http.Request) error {
 	}
 
 	i.proxy.addWeaveWaitVolume(hostConfig)
-	if dnsDomain, withDNS := i.proxy.getDNSDomain(); withDNS {
+	if dnsDomain := i.proxy.getDNSDomain(); dnsDomain != "" {
 		if err := i.proxy.setWeaveDNS(hostConfig, container.Config.Hostname, dnsDomain); err != nil {
 			return err
 		}