Merge branch '1.4'

This commit is contained in:
Matthias Radestock committed 2016-01-29 16:07:20 +00:00
commit 2e9c1ee046
1 file changed
+22 -6
+22 -6
View File
@@ -5,6 +5,8 @@ import (
"fmt" "fmt"
"net" "net"
"os" "os"
"os/signal"
"syscall"
"github.com/docker/libnetwork/ipamapi" "github.com/docker/libnetwork/ipamapi"
. "github.com/weaveworks/weave/common" . "github.com/weaveworks/weave/common"
@@ -49,26 +51,40 @@ func main() {
Log.Println("Weave plugin", version, "Command line options:", os.Args[1:]) Log.Println("Weave plugin", version, "Command line options:", os.Args[1:])
Log.Info(dockerClient.Info()) Log.Info(dockerClient.Info())
err = run(dockerClient, address, meshAddress, noMulticastRoute)
if err != nil {
Log.Fatal(err)
}
}
func run(dockerClient *docker.Client, address, meshAddress string, noMulticastRoute bool) error {
endChan := make(chan error, 1) endChan := make(chan error, 1)
if address != "" { if address != "" {
globalListener, err := listenAndServe(dockerClient, address, noMulticastRoute, endChan, "global", false) globalListener, err := listenAndServe(dockerClient, address, noMulticastRoute, endChan, "global", false)
if err != nil { if err != nil {
Log.Fatalf("unable to create driver: %s", err) return err
} }
defer os.Remove(address)
defer globalListener.Close() defer globalListener.Close()
} }
if meshAddress != "" { if meshAddress != "" {
meshListener, err := listenAndServe(dockerClient, meshAddress, noMulticastRoute, endChan, "local", true) meshListener, err := listenAndServe(dockerClient, meshAddress, noMulticastRoute, endChan, "local", true)
if err != nil { if err != nil {
Log.Fatalf("unable to create driver: %s", err) return err
} }
defer os.Remove(meshAddress)
defer meshListener.Close() defer meshListener.Close()
} }
err = <-endChan sigChan := make(chan os.Signal, 1)
if err != nil { signal.Notify(sigChan, os.Interrupt, os.Kill, syscall.SIGTERM)
Log.Errorf("Error from listener: %s", err)
os.Exit(1) select {
case sig := <-sigChan:
Log.Debugf("Caught signal %s; shutting down", sig)
return nil
case err := <-endChan:
return err
} }
} }