tools-446 make connection errors consistent across all tools.

Former-commit-id: 5b50836

mongodump/main/mongodump.go

@@ -59,13 +59,13 @@ func main() {
 
 	err = dump.Init()
 	if err != nil {
-		log.Logf(log.Always, "%v", err)
+		log.Logf(log.Always, "Failed: %v", err)
 		os.Exit(util.ExitError)
 	}
 
 	err = dump.Dump()
 	if err != nil {
-		log.Logf(log.Always, "%v", err)
+		log.Logf(log.Always, "Failed: %v", err)
 		os.Exit(util.ExitError)
 	}
 

mongodump/mongodump.go

@@ -93,11 +93,11 @@ func (dump *MongoDump) Init() error {
 
 	dump.isMongos, err = dump.sessionProvider.IsMongos()
 	if err != nil {
-		return fmt.Errorf("Error determining if server is mongos: %v", err)
+		return err
 	}
 	// return a helpful error message for mongos
 	if dump.OutputOptions.Repair && dump.isMongos {
-		return fmt.Errorf("Error: --repair flag cannot be used on a mongos")
+		return fmt.Errorf("--repair flag cannot be used on a mongos")
 	}
 	dump.manager = intents.NewIntentManager()
 	dump.progressManager = progress.NewProgressBarManager(ProgressBarWaitTime)

mongoexport/main/mongoexport.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"github.com/mongodb/mongo-tools/common/db"
 	"github.com/mongodb/mongo-tools/common/log"
 	commonopts "github.com/mongodb/mongo-tools/common/options"
@@ -68,15 +67,13 @@ func main() {
 
 	numDocs, err := exporter.Export()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		log.Logf(log.Always, "Failed: %v\n", err)
 		os.Exit(util.ExitError)
 	}
 
-	if !opts.Quiet {
-		if numDocs == 1 {
-			log.Logf(log.Always, "exported %v record", numDocs)
-		} else {
-			log.Logf(log.Always, "exported %v records", numDocs)
-		}
+	if numDocs == 1 {
+		log.Logf(log.Always, "exported %v record", numDocs)
+	} else {
+		log.Logf(log.Always, "exported %v records", numDocs)
 	}
 }

mongoexport/mongoexport.go

@@ -153,7 +153,7 @@ func (exp *MongoExport) getCursor() (*mgo.Iter, *mgo.Session, error) {
 
 	session, err := exp.SessionProvider.GetSession()
 	if err != nil {
-		return nil, nil, fmt.Errorf("error getting database session: %v", err)
+		return nil, nil, err
 	}
 
 	skip := 0

mongofiles/main/mongofiles.go

@@ -70,14 +70,14 @@ func main() {
 	}
 
 	if err := mf.ValidateCommand(args); err != nil {
-		log.Logf(log.Always, "error: %v", err)
+		log.Logf(log.Always, "Invalid command: %v", err)
 		opts.PrintHelp(true)
 		os.Exit(util.ExitError)
 	}
 
 	output, err := mf.Run(true)
 	if err != nil {
-		log.Logf(log.Always, "%v", err)
+		log.Logf(log.Always, "Failed: %v", err)
 		os.Exit(util.ExitError)
 	}
 	fmt.Printf("%s", output)

mongofiles/mongofiles.go

@@ -195,7 +195,7 @@ func (self *MongoFiles) Run(displayConnUrl bool) (string, error) {
 	// get session
 	session, err := self.SessionProvider.GetSession()
 	if err != nil {
-		return "", fmt.Errorf("error connecting to db: %v", err)
+		return "", err
 	}
 	defer session.Close()
 

mongoimport/main/mongoimport.go

@@ -69,7 +69,7 @@ func main() {
 	numDocs, err := mongoImport.ImportDocuments()
 	if !opts.Quiet {
 		if err != nil {
-			log.Logf(log.Always, "error encountered while importing documents: %v", err)
+			log.Logf(log.Always, "Failed: %v", err)
 		}
 		message := fmt.Sprintf("imported 1 document")
 		if numDocs != 1 {

mongoimport/mongoimport.go

@@ -244,7 +244,7 @@ func (mongoImport *MongoImport) ImportDocuments() (uint64, error) {
 func (mongoImport *MongoImport) importDocuments(inputReader InputReader) (numImported uint64, retErr error) {
 	session, err := mongoImport.SessionProvider.GetSession()
 	if err != nil {
-		return 0, fmt.Errorf("error connecting to mongod: %v", err)
+		return 0, err
 	}
 	var readErr error
 	defer func() {

mongorestore/main/mongorestore.go

@@ -62,7 +62,7 @@ func main() {
 
 	err = restore.Restore()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
+		log.Logf(log.Always, "Failed: %v", err)
 		os.Exit(util.ExitError)
 	}
 }

mongorestore/mongorestore.go

@@ -81,7 +81,7 @@ func (restore *MongoRestore) ParseAndValidateOptions() error {
 	var err error
 	restore.isMongos, err = restore.SessionProvider.IsMongos()
 	if err != nil {
-		return fmt.Errorf("error determining if connected to a mongos: %v", err)
+		return err
 	}
 	if restore.isMongos {
 		log.Log(log.DebugLow, "restoring to a sharded system")
@@ -136,7 +136,8 @@ func (restore *MongoRestore) ParseAndValidateOptions() error {
 func (restore *MongoRestore) Restore() error {
 	err := restore.ParseAndValidateOptions()
 	if err != nil {
-		return fmt.Errorf("options error: %v", err)
+		log.Logf(log.DebugLow, "got error from options parsing: %v", err)
+		return err
 	}
 
 	// 1. Build up all intents to be restored

mongostat/main/mongostat.go

@@ -112,7 +112,7 @@ func main() {
 	// kick it off
 	err = stat.Run()
 	if err != nil {
-		log.Logf(log.Always, "Error: %v", err)
+		log.Logf(log.Always, "Failed: %v", err)
 		os.Exit(util.ExitError)
 	}
 }

mongotop/main/mongotop.go

@@ -79,7 +79,7 @@ func main() {
 
 	// kick it off
 	if err := top.Run(); err != nil {
-		log.Logf(log.Always, "error running mongotop: %v", err)
+		log.Logf(log.Always, "Failed: %v", err)
 		os.Exit(util.ExitError)
 	}
 }

mongotop/mongotop.go

@@ -86,13 +86,13 @@ func (mt *MongoTop) Run() error {
 		numPrinted++
 		diff, err := mt.runDiff()
 		if err != nil {
-			log.Logf(log.Always, "Error: %v\n", err)
-
 			// If this is the first time trying to poll the server and it fails,
 			// just stop now instead of trying over and over.
 			if !hasData {
 				return err
 			}
+
+			log.Logf(log.Always, "Error: %v\n", err)
 			time.Sleep(mt.Sleeptime)
 		}