Wait for ethwe via netlink, not via polling or signals

('docker kill' breaks restart policy)
This commit is contained in:
Bryan Boreham committed 2015-08-27 15:03:41 +01:00
1 parent 42b64f826b
commit 6e89b036e2
5 files changed
+47 -39

No files matched your search

+1 -3
View File
@@ -43,7 +43,6 @@ func main() {
routerName string
nickName string
password string
wait int
pktdebug bool
logLevel string
prof string
@@ -71,7 +70,6 @@ func main() {
mflag.StringVar(&routerName, []string{"#name", "-name"}, "", "name of router (defaults to MAC of interface)")
mflag.StringVar(&nickName, []string{"#nickname", "-nickname"}, "", "nickname of peer (defaults to hostname)")
mflag.StringVar(&password, []string{"#password", "-password"}, "", "network password")
mflag.IntVar(&wait, []string{"#wait", "-wait"}, -1, "number of seconds to wait for interface to come up (0=don't wait, -1=wait forever)")
mflag.StringVar(&logLevel, []string{"-log-level"}, "info", "logging level (debug, info, warning, error)")
mflag.BoolVar(&pktdebug, []string{"#pktdebug", "#-pktdebug", "-pkt-debug"}, false, "enable per-packet debug logging")
mflag.StringVar(&prof, []string{"#profile", "-profile"}, "", "enable profiling and write profiles to given path")
@@ -118,7 +116,7 @@ func main() {
var err error
if ifaceName != "" {
config.Iface, err = weavenet.EnsureInterface(ifaceName, wait)
config.Iface, err = weavenet.EnsureInterface(ifaceName)
if err != nil {
Log.Fatal(err)
}
+2 -15
View File
@@ -5,7 +5,6 @@ import (
"fmt"
"os"
"os/exec"
"os/signal"
"syscall"
weavenet "github.com/weaveworks/weave/net"
@@ -17,22 +16,10 @@ var (
func main() {
var (
args = os.Args[1:]
notInExec = true
args = os.Args[1:]
)
if len(args) > 0 && args[0] == "-s" {
notInExec = false
args = args[1:]
}
if notInExec {
usr2 := make(chan os.Signal)
signal.Notify(usr2, syscall.SIGUSR2)
<-usr2
}
_, err := weavenet.EnsureInterface("ethwe", -1)
_, err := weavenet.EnsureInterface("ethwe")
checkErr(err)
if len(args) == 0 {