Remove attach-router since it no longer does anything

This commit is contained in:
Bryan Boreham committed 2017-04-17 19:41:47 +00:00
1 parent ae625a18c8
commit f479e57870
2 files changed
+1 -24

No files matched your search

-9
View File
@@ -408,11 +408,6 @@ func containerShouldAttach(container *docker.Container) bool {
return len(container.Config.Entrypoint) > 0 && container.Config.Entrypoint[0] == weaveWaitEntrypoint[0]
}
func containerIsWeaveRouter(container *docker.Container) bool {
return container.Name == weaveContainerName &&
len(container.Config.Entrypoint) > 0 && container.Config.Entrypoint[0] == weaveEntrypoint
}
func (proxy *Proxy) createWait(r *http.Request, ident string) {
proxy.Lock()
proxy.waiters[r] = &wait{ident: ident, ch: make(chan error, 1)}
@@ -489,10 +484,6 @@ func (proxy *Proxy) attach(containerID string) error {
}
return nil
}
if containerIsWeaveRouter(container) {
Log.Infof("Attaching weave router container: %s", container.ID)
return callWeaveAttach(container, []string{"attach-router"})
}
if !containerShouldAttach(container) || !container.State.Running {
return nil
}