don't panic on invalid settings

Former-commit-id: c7ecfa280c4ff91c5c1f59d30a120a0a8621cd2c

2 files changed, 8 insertions, 10 deletions

diff --git a/src/github.com/mongodb/mongo-tools/mongoimport/import_writers.go b/src/github.com/mongodb/mongo-tools/mongoimport/import_writers.go
index d049747f2f9..474165d9266 100644
--- a/src/github.com/mongodb/mongo-tools/mongoimport/import_writers.go
+++ b/src/github.com/mongodb/mongo-tools/mongoimport/import_writers.go
@@ -25,13 +25,12 @@ type DriverImportWriter struct {
 type ShimImportWriter struct {
 	upsertMode   bool
 	upsertFields []string
-
-	importShim *db.StorageShim //shim used during the actual import phase itself
-	docSink    *db.EncodedBSONSink
-
-	dbPath             string
-	dbName, collection string
-	shimPath           string
+	importShim   *db.StorageShim
+	docSink      *db.EncodedBSONSink
+	dbPath       string
+	dbName       string
+	collection   string
+	shimPath     string
 }
 
 func (siw *ShimImportWriter) Open(dbName, collection string) error {
diff --git a/src/github.com/mongodb/mongo-tools/mongoimport/main/mongoimport.go b/src/github.com/mongodb/mongo-tools/mongoimport/main/mongoimport.go
index 1085542b03b..857c2edadcd 100644
--- a/src/github.com/mongodb/mongo-tools/mongoimport/main/mongoimport.go
+++ b/src/github.com/mongodb/mongo-tools/mongoimport/main/mongoimport.go
@@ -24,7 +24,8 @@ func main() {
 
 	_, err := opts.Parse()
 	if err != nil {
-		util.Panicf("error parsing command line options: %v", err)
+		fmt.Fprintf(os.Stderr, "Error parsing command line options: %v", err)
+		util.ExitFail()
 	}
 
 	// print help, if specified
@@ -50,7 +51,6 @@ func main() {
 	if err = importer.ValidateSettings(); err != nil {
 		util.PrintfTimeStamped("Error validating settings: %v\n", err)
 		util.ExitFail()
-		return
 	}
 
 	numDocs, err := importer.ImportDocuments()
@@ -64,6 +64,5 @@ func main() {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error importing documents: %v\n", err)
 		util.ExitFail()
-		return
 	}
 }