TOOLS-373: call ExitFail on errors

Former-commit-id: 1ec5c7cad8fa6b4467d246bdb4df041f235ab293

4 files changed, 12 insertions, 27 deletions

diff --git a/common/util/util.go b/common/util/util.go
deleted file mode 100644
index 5991cbe5b3e..00000000000
--- a/common/util/util.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Package util implements various utility functions.
-package util
-
-import "os"
-
-func ExitFail() {
-	os.Exit(-1)
-}
diff --git a/mongoimport/main/mongoimport.go b/mongoimport/main/mongoimport.go
index 1fb98fe615f..6b6fb316111 100644
--- a/mongoimport/main/mongoimport.go
+++ b/mongoimport/main/mongoimport.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"github.com/mongodb/mongo-tools/common/db"
 	"github.com/mongodb/mongo-tools/common/log"
-	"os"
 	commonopts "github.com/mongodb/mongo-tools/common/options"
 	"github.com/mongodb/mongo-tools/mongoimport"
 	"github.com/mongodb/mongo-tools/mongoimport/options"
@@ -26,7 +26,7 @@ func main() {
 	if err != nil {
 		log.Logf(log.Always, "error parsing command line options: %v", err)
 		opts.PrintHelp(true)
-		os.Exit(1)
+		os.Exit(-1)
 	}
 
 	log.SetVerbosity(opts.Verbosity)
@@ -57,7 +57,7 @@ func main() {
 	if err = mongoImport.ValidateSettings(args); err != nil {
 		log.Logf(log.Always, "error validating settings: %v", err)
 		opts.PrintHelp(true)
-		os.Exit(1)
+		os.Exit(-1)
 	}
 
 	numDocs, err := mongoImport.ImportDocuments()
@@ -72,6 +72,6 @@ func main() {
 		log.Logf(log.Always, message)
 	}
 	if err != nil {
-		os.Exit(1)
+		os.Exit(-1)
 	}
 }
diff --git a/mongorestore/main/mongorestore.go b/mongorestore/main/mongorestore.go
index 851269af842..7516da7aa44 100644
--- a/mongorestore/main/mongorestore.go
+++ b/mongorestore/main/mongorestore.go
@@ -24,7 +24,7 @@ func main() {
 	if err != nil {
 		fmt.Printf("error parsing command line options: %v\n\n", err)
 		fmt.Printf("try 'mongorestore --help' for more information\n")
-		os.Exit(2)
+		os.Exit(-1)
 	}
 
 	// print help or version info, if specified
@@ -43,7 +43,7 @@ func main() {
 	targetDir, err := getTargetDirFromArgs(extraArgs, os.Args, inputOpts.Directory)
 	if err != nil {
 		fmt.Printf("error parsing command line options: %v\n", err)
-		os.Exit(2)
+		os.Exit(-1)
 	}
 	targetDir = util.ToUniversalPath(targetDir)
 
@@ -60,8 +60,7 @@ func main() {
 	err = restore.Restore()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
-		util.ExitFail()
-		return
+		os.Exit(-1)
 	}
 }
 
diff --git a/mongostat/main/mongostat.go b/mongostat/main/mongostat.go
index 1cf6af55a54..39d46b8bf41 100644
--- a/mongostat/main/mongostat.go
+++ b/mongostat/main/mongostat.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/mongodb/mongo-tools/common/log"
 	commonopts "github.com/mongodb/mongo-tools/common/options"
-	"github.com/mongodb/mongo-tools/common/util"
 	"github.com/mongodb/mongo-tools/mongostat"
 	"github.com/mongodb/mongo-tools/mongostat/options"
 	"os"
@@ -27,8 +26,7 @@ func main() {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Invalid options: %v\n", err)
 		opts.PrintHelp(true)
-		util.ExitFail()
-		return
+		os.Exit(-1)
 	}
 
 	sleepInterval := 1
@@ -36,19 +34,16 @@ func main() {
 		if len(extra) != 1 {
 			fmt.Fprintf(os.Stderr, "Too many positional operators\n")
 			opts.PrintHelp(true)
-			util.ExitFail()
-			return
+		os.Exit(-1)
 		}
 		sleepInterval, err = strconv.Atoi(extra[0])
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Bad sleep interval: %v\n", extra[0])
-			util.ExitFail()
-			return
+		os.Exit(-1)
 		}
 		if sleepInterval < 1 {
 			fmt.Fprintf(os.Stderr, "Sleep interval must be at least 1 second\n")
-			util.ExitFail()
-			return
+		os.Exit(-1)
 		}
 	}
 
@@ -105,7 +100,6 @@ func main() {
 	err = stat.Run()
 	if err != nil {
 		log.Logf(log.Always, "Error: %v", err)
-		util.ExitFail()
-		return
+		os.Exit(-1)
 	}
 }