From 657bbbffbc1be6d109e6d61aebcd464a0054b2c0 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 24 Jun 2015 18:17:15 +0100 Subject: [PATCH] tiny refactor: raise abstraction level --- proxy/create_container_interceptor.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/proxy/create_container_interceptor.go b/proxy/create_container_interceptor.go index db9433ef..69f5815b 100644 --- a/proxy/create_container_interceptor.go +++ b/proxy/create_container_interceptor.go @@ -56,7 +56,7 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error { if err := i.setWeaveWaitEntrypoint(container.Config); err != nil { return err } - if err := i.setWeaveDNS(&container, r); err != nil { + if err := i.setWeaveDNS(&container, r.URL.Query().Get("name")); err != nil { return err } } @@ -96,7 +96,7 @@ func (i *createContainerInterceptor) setWeaveWaitEntrypoint(container *docker.Co return nil } -func (i *createContainerInterceptor) setWeaveDNS(container *createContainerRequestBody, r *http.Request) error { +func (i *createContainerInterceptor) setWeaveDNS(container *createContainerRequestBody, name string) error { if i.proxy.WithoutDNS { return nil } @@ -108,7 +108,6 @@ func (i *createContainerInterceptor) setWeaveDNS(container *createContainerReque container.HostConfig.DNS = append(container.HostConfig.DNS, i.proxy.dockerBridgeIP) - name := r.URL.Query().Get("name") if container.Hostname == "" && name != "" { container.Hostname = name // Strip trailing period because it's unusual to see it used on the end of a host name