Remove remaining log.Fatal

jeanlaurent · jeanlaurent · commit f10584ec855e · 2016-01-07T12:32:55.000+01:00
Signed-off-by: Jean-Laurent de Morlhon &lt;jeanlaurent@morlhon.net&gt;
diff --git a/cmd/machine.go b/cmd/machine.go
@@ -204,11 +204,12 @@ func runDriver(driverName string) {
 }
 
 func cmdNotFound(c *cli.Context, command string) {
-	log.Fatalf(
+	log.Errorf(
 		"%s: '%s' is not a %s command. See '%s --help'.",
 		c.App.Name,
 		command,
 		c.App.Name,
 		os.Args[0],
 	)
+	os.Exit(1)
 }
diff --git a/commands/ls.go b/commands/ls.go
@@ -312,8 +312,8 @@ func matchesName(host *host.Host, names []string) bool {
 	for _, n := range names {
 		r, err := regexp.Compile(n)
 		if err != nil {
-			// TODO: remove that call to Fatal
-			log.Fatal(err)
+			log.Error(err)
+			os.Exit(1) // TODO: Can we get rid of this call, and exit 'properly' ?
 		}
 		if r.MatchString(host.Driver.GetMachineName()) {
 			return true
diff --git a/libmachine/examples/vbox_create.go b/libmachine/examples/vbox_create.go
@@ -25,29 +25,34 @@ func main() {
 
 	data, err := json.Marshal(driver)
 	if err != nil {
-		log.Fatal(err)
+		log.Error(err)
+		return
 	}
 
 	h, err := client.NewHost("virtualbox", data)
 	if err != nil {
-		log.Fatal(err)
+		log.Error(err)
+		return
 	}
 
 	h.HostOptions.EngineOptions.StorageDriver = "overlay"
 
 	if err := client.Create(h); err != nil {
-		log.Fatal(err)
+		log.Error(err)
+		return
 	}
 
 	out, err := h.RunSSHCommand("df -h")
 	if err != nil {
-		log.Fatal(err)
+		log.Error(err)
+		return
 	}
 
 	fmt.Printf("Results of your disk space query:\n%s\n", out)
 
 	fmt.Println("Powering down machine now...")
 	if err := h.Stop(); err != nil {
-		log.Fatal(err)
+		log.Error(err)
+		return
 	}
 }
diff --git a/libmachine/log/fmt_machine_logger.go b/libmachine/log/fmt_machine_logger.go
@@ -69,18 +69,6 @@ func (ml *FmtMachineLogger) Infof(fmtString string, args ...interface{}) {
 	fmt.Fprintf(ml.outWriter, fmtString+"\n", args...)
 }
 
-func (ml *FmtMachineLogger) Fatal(args ...interface{}) {
-	ml.history.Record(args...)
-	fmt.Fprintln(ml.errWriter, args...)
-	os.Exit(1)
-}
-
-func (ml *FmtMachineLogger) Fatalf(fmtString string, args ...interface{}) {
-	ml.history.Recordf(fmtString, args...)
-	fmt.Fprintf(ml.errWriter, fmtString+"\n", args...)
-	os.Exit(1)
-}
-
 func (ml *FmtMachineLogger) Warn(args ...interface{}) {
 	ml.history.Record(args...)
 	fmt.Fprintln(ml.outWriter, args...)
diff --git a/libmachine/log/log.go b/libmachine/log/log.go
@@ -49,14 +49,6 @@ func Infof(fmtString string, args ...interface{}) {
 	logger.Infof(fmtString, args...)
 }
 
-func Fatal(args ...interface{}) {
-	logger.Fatal(args...)
-}
-
-func Fatalf(fmtString string, args ...interface{}) {
-	logger.Fatalf(fmtString, args...)
-}
-
 func Warn(args ...interface{}) {
 	logger.Warn(args...)
 }
diff --git a/libmachine/log/machine_logger.go b/libmachine/log/machine_logger.go
@@ -17,9 +17,6 @@ type MachineLogger interface {
 	Info(args ...interface{})
 	Infof(fmtString string, args ...interface{})
 
-	Fatal(args ...interface{})
-	Fatalf(fmtString string, args ...interface{})
-
 	Warn(args ...interface{})
 	Warnf(fmtString string, args ...interface{})
 

Original file line number	Diff line number	Diff line change
`@@ -204,11 +204,12 @@ func runDriver(driverName string) {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`func cmdNotFound(c *cli.Context, command string) {`
`207`		`- log.Fatalf(`
	`207`	`+ log.Errorf(`
`208`	`208`	`"%s: '%s' is not a %s command. See '%s --help'.",`
`209`	`209`	`c.App.Name,`
`210`	`210`	`command,`
`211`	`211`	`c.App.Name,`
`212`	`212`	`os.Args[0],`
`213`	`213`	`)`
	`214`	`+ os.Exit(1)`
`214`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,29 +25,34 @@ func main() {`
`25`	`25`
`26`	`26`	`data, err := json.Marshal(driver)`
`27`	`27`	`if err != nil {`
`28`		`- log.Fatal(err)`
	`28`	`+ log.Error(err)`
	`29`	`+ return`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`h, err := client.NewHost("virtualbox", data)`
`32`	`33`	`if err != nil {`
`33`		`- log.Fatal(err)`
	`34`	`+ log.Error(err)`
	`35`	`+ return`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`h.HostOptions.EngineOptions.StorageDriver = "overlay"`
`37`	`39`
`38`	`40`	`if err := client.Create(h); err != nil {`
`39`		`- log.Fatal(err)`
	`41`	`+ log.Error(err)`
	`42`	`+ return`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`out, err := h.RunSSHCommand("df -h")`
`43`	`46`	`if err != nil {`
`44`		`- log.Fatal(err)`
	`47`	`+ log.Error(err)`
	`48`	`+ return`
`45`	`49`	`}`
`46`	`50`
`47`	`51`	`fmt.Printf("Results of your disk space query:\n%s\n", out)`
`48`	`52`
`49`	`53`	`fmt.Println("Powering down machine now...")`
`50`	`54`	`if err := h.Stop(); err != nil {`
`51`		`- log.Fatal(err)`
	`55`	`+ log.Error(err)`
	`56`	`+ return`
`52`	`57`	`}`
`53`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,6 @@ func Infof(fmtString string, args ...interface{}) {`
`49`	`49`	`logger.Infof(fmtString, args...)`
`50`	`50`	`}`
`51`	`51`
`52`		`-func Fatal(args ...interface{}) {`
`53`		`- logger.Fatal(args...)`
`54`		`-}`
`55`		`-`
`56`		`-func Fatalf(fmtString string, args ...interface{}) {`
`57`		`- logger.Fatalf(fmtString, args...)`
`58`		`-}`
`59`		`-`
`60`	`52`	`func Warn(args ...interface{}) {`
`61`	`53`	`logger.Warn(args...)`
`62`	`54`	`}`