Merge pull request #1101 from unclejack/fix_netd_fatalf_call

dseevr · web-flow · commit 0308c0f45158 · 2017-12-13T11:41:11.000-08:00
netplugin/netd.go: call Fatalf to use formatting
diff --git a/netplugin/netd.go b/netplugin/netd.go
@@ -81,7 +81,7 @@ func initNetPluginConfig(ctx *cli.Context) (*plugin.Config, error) {
 	if controlIP == "" {
 		controlIP, configErr = netutils.GetDefaultAddr()
 		if configErr != nil {
-			logrus.Fatal("Failed to get host address: %s", configErr.Error())
+			logrus.Fatalf("Failed to get host address: %s", configErr.Error())
 		}
 	}
 	logrus.Infof("Using netplugin control IP: %v", controlIP)
@@ -90,7 +90,7 @@ func initNetPluginConfig(ctx *cli.Context) (*plugin.Config, error) {
 	if vtepIP == "" {
 		vtepIP, configErr = netutils.GetDefaultAddr()
 		if configErr != nil {
-			logrus.Fatal("Failed to get host address: %s", configErr.Error())
+			logrus.Fatalf("Failed to get host address: %s", configErr.Error())
 		}
 	}
 	logrus.Infof("Using netplugin VTEP IP: %v", vtepIP)

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func initNetPluginConfig(ctx cli.Context) (plugin.Config, error) {`
`81`	`81`	`if controlIP == "" {`
`82`	`82`	`controlIP, configErr = netutils.GetDefaultAddr()`
`83`	`83`	`if configErr != nil {`
`84`		`- logrus.Fatal("Failed to get host address: %s", configErr.Error())`
	`84`	`+ logrus.Fatalf("Failed to get host address: %s", configErr.Error())`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`logrus.Infof("Using netplugin control IP: %v", controlIP)`
`@@ -90,7 +90,7 @@ func initNetPluginConfig(ctx cli.Context) (plugin.Config, error) {`
`90`	`90`	`if vtepIP == "" {`
`91`	`91`	`vtepIP, configErr = netutils.GetDefaultAddr()`
`92`	`92`	`if configErr != nil {`
`93`		`- logrus.Fatal("Failed to get host address: %s", configErr.Error())`
	`93`	`+ logrus.Fatalf("Failed to get host address: %s", configErr.Error())`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`logrus.Infof("Using netplugin VTEP IP: %v", vtepIP)`