From 18a62cdb604508760bc29d9c9ff7dcc6f10f8e2d Mon Sep 17 00:00:00 2001
From: Waldemar Quevedo <wally@synadia.com>
Date: Tue, 2 Oct 2018 11:50:47 -0700
Subject: [PATCH] Change style of reporting errors with line and pos

Signed-off-by: Waldemar Quevedo <wally@synadia.com>
---
 conf/parse.go               | 3 +--
 server/config_check_test.go | 4 ++--
 server/opts.go              | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conf/parse.go b/conf/parse.go
index 866c8191..ddcf4e23 100644
--- a/conf/parse.go
+++ b/conf/parse.go
@@ -394,12 +394,11 @@ func (p *parser) setValue(val interface{}) {
 		key := p.popKey()
 
 		if p.pedantic {
-			it := p.popItemKey()
-
 			// Change the position to the beginning of the key
 			// since more useful when reporting errors.
 			switch v := val.(type) {
 			case *token:
+				it := p.popItemKey()
 				v.item.pos = it.pos
 				v.item.line = it.line
 				ctx[key] = v
diff --git a/server/config_check_test.go b/server/config_check_test.go
index 29487565..fe7451f0 100644
--- a/server/config_check_test.go
+++ b/server/config_check_test.go
@@ -520,7 +520,7 @@ func TestConfigCheck(t *testing.T) {
 				err := checkConfig(conf, true)
 				expectedErr := test.pedanticErr
 				if err != nil && expectedErr != nil {
-					msg := fmt.Sprintf("%s in %s:%d:%d", expectedErr.Error(), conf, test.errorLine, test.errorPos)
+					msg := fmt.Sprintf("%s:%d:%d: %s", conf, test.errorLine, test.errorPos, expectedErr.Error())
 					if test.reason != "" {
 						msg += ": " + test.reason
 					}
@@ -560,7 +560,7 @@ func TestConfigCheckIncludes(t *testing.T) {
 	if err == nil {
 		t.Errorf("Expected error processing include files with configuration check enabled: %v", err)
 	}
-	expectedErr := errors.New(`unknown field "monitoring_port" in configs/include_bad_conf_check_b.conf:10:19`)
+	expectedErr := errors.New(`configs/include_bad_conf_check_b.conf:10:19: unknown field "monitoring_port"`)
 	if err != nil && expectedErr != nil && err.Error() != expectedErr.Error() {
 		t.Errorf("Expected %q, got %q", expectedErr.Error(), err.Error())
 	}
diff --git a/server/opts.go b/server/opts.go
index a8dd73eb..b84ecec4 100644
--- a/server/opts.go
+++ b/server/opts.go
@@ -208,7 +208,7 @@ type unknownConfigFieldErr struct {
 func (e *unknownConfigFieldErr) Error() string {
 	msg := fmt.Sprintf("unknown field %q", e.field)
 	if e.token != nil {
-		return msg + fmt.Sprintf(" in %s:%d:%d", e.configFile, e.token.Line(), e.token.Position())
+		return fmt.Sprintf("%s:%d:%d: %s", e.configFile, e.token.Line(), e.token.Position(), msg)
 	}
 	return msg
 }
@@ -223,7 +223,7 @@ type configWarningErr struct {
 func (e *configWarningErr) Error() string {
 	msg := fmt.Sprintf("invalid use of field %q", e.field)
 	if e.token != nil {
-		msg += fmt.Sprintf(" in %s:%d:%d", e.configFile, e.token.Line(), e.token.Position())
+		msg = fmt.Sprintf("%s:%d:%d: %s", e.configFile, e.token.Line(), e.token.Position(), msg)
 	}
 	msg += ": " + e.reason
 	return msg