Use driver name to detect 'our' endpoints

so we don't have to remember all the endpoint IDs, or load them up
after a restart.
This commit is contained in:
Bryan Boreham committed 2016-06-14 17:52:45 +01:00
1 parent 73a393823a
commit c71c630cf6
3 files changed
+36 -40

No files matched your search

+3 -1
View File
@@ -7,6 +7,7 @@ import (
"net/http"
"os"
"os/signal"
"path"
"strings"
"syscall"
@@ -121,7 +122,8 @@ func run(dockerClient *docker.Client, weave *weaveapi.Client, address, meshAddre
}
func listenAndServe(dockerClient *docker.Client, weave *weaveapi.Client, address string, endChan chan<- error, scope string, withIpam bool) (net.Listener, error) {
d, err := netplugin.New(dockerClient, weave, scope)
name := strings.TrimSuffix(path.Base(address), ".sock")
d, err := netplugin.New(dockerClient, weave, name, scope)
if err != nil {
return nil, err
}