Updated error logging.

lib/utils/cli.go

@@ -133,7 +133,16 @@ func UserMessageFromError(err error) string {
 		return trace.DebugReport(err)
 	}
 	if err != nil {
-		return err.Error()
+		// If the error is a trace error, check if it has a user message embedded in
+		// it. If a user message is embedded in it, print the user message and the
+		// original error. Otherwise return the original with a generic "A fatal
+		// error occured" message.
+		if er, ok := err.(*trace.TraceErr); ok {
+			if er.Message != "" {
+				return fmt.Sprintf("%v: %v", er.Message, er.Err.Error())
+			}
+		}
+		return fmt.Sprintf("A fatal error occurred: %v", err.Error())
 	}
 	return ""
 }

tool/teleport/common/teleport.go

@@ -144,9 +144,6 @@ func Run(options Options) (executedCommand string, conf *service.Config) {
 		if err = config.Configure(&ccf, conf); err != nil {
 			utils.FatalError(err)
 		}
-		if !options.InitOnly {
-			log.Debug(conf.DebugDumpToYAML())
-		}
 		if !options.InitOnly {
 			err = OnStart(conf)
 		}
@@ -170,11 +167,11 @@ func Run(options Options) (executedCommand string, conf *service.Config) {
 func OnStart(config *service.Config) error {
 	srv, err := service.NewTeleport(config)
 	if err != nil {
-		return trace.Wrap(err, "initializing teleport")
+		return trace.Wrap(err, "Initialization failed")
 	}
 
 	if err := srv.Start(); err != nil {
-		return trace.Wrap(err, "starting teleport")
+		return trace.Wrap(err, "Startup Failed")
 	}
 
 	return srv.WaitForSignals(context.TODO())