From 7cb46e191909737d4afa5a2d9e1d24930e511b4e Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Mon, 17 Jul 2017 13:03:50 +1000
Subject: [PATCH] report some more useful cfg validation info when using ros
 config merge

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 cmd/control/config.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cmd/control/config.go b/cmd/control/config.go
index ee21aaa9..b7ebca1e 100644
--- a/cmd/control/config.go
+++ b/cmd/control/config.go
@@ -225,7 +225,15 @@ func merge(c *cli.Context) error {
 	}
 
 	if err = config.Merge(bytes); err != nil {
-		log.Fatal(err)
+		log.Error(err)
+		validationErrors, err := config.ValidateBytes(bytes)
+		if err != nil {
+			log.Fatal(err)
+		}
+		for _, validationError := range validationErrors.Errors() {
+			log.Error(validationError)
+		}
+		log.Fatal("EXITING: Failed to parse configuration")
 	}
 
 	return nil