From 911c7d993e2978560226f08caa0d7e6237a5cf6b Mon Sep 17 00:00:00 2001
From: Reed Allman <reed@rdallman.com>
Date: Wed, 26 Sep 2018 11:56:14 -0700
Subject: [PATCH] help people figure out why their syslog url is wrong more
 better (#1242)

closes #1240
---
 api/models/app.go       | 9 ++++-----
 api/server/apps_test.go | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/api/models/app.go b/api/models/app.go
index 2d7fc2476..d479ed9ec 100644
--- a/api/models/app.go
+++ b/api/models/app.go
@@ -86,17 +86,16 @@ func (a *App) Validate() error {
 
 	if a.SyslogURL != nil && *a.SyslogURL != "" {
 		url, err := url.Parse(strings.TrimSpace(*a.SyslogURL))
-		fail := err != nil
-		if !fail {
+		if err == nil {
 			// See: https://docs.docker.com/config/containers/logging/syslog/#options
 			switch url.Scheme {
 			case "udp", "tcp", "unix", "unixgram", "tcp+tls":
 			default:
-				fail = true
+				err = fmt.Errorf("invalid scheme, only [tcp, udp, unix, unixgram, tcp+tls] are supported")
 			}
 		}
-		if fail {
-			return ErrInvalidSyslog(fmt.Sprintf(`invalid syslog url: "%v"`, *a.SyslogURL))
+		if err != nil { // not else if for a reason...
+			return ErrInvalidSyslog(fmt.Sprintf(`invalid syslog url: "%v" %v`, *a.SyslogURL, err))
 		}
 	}
 	return nil
diff --git a/api/server/apps_test.go b/api/server/apps_test.go
index 3b18b33df..586680f22 100644
--- a/api/server/apps_test.go
+++ b/api/server/apps_test.go
@@ -56,7 +56,7 @@ func TestAppCreate(t *testing.T) {
 		{datastore.NewMock(), logs.NewMock(), "/v2/apps", `{ "name": "app", "annotations" : { "":"val" }}`, http.StatusBadRequest, models.ErrInvalidAnnotationKey},
 		{datastore.NewMock(), logs.NewMock(), "/v2/apps", `{"name": "app", "annotations" : { "key":"" }}`, http.StatusBadRequest, models.ErrInvalidAnnotationValue},
 		{datastore.NewMock(), logs.NewMock(), "/v2/apps", `{ "name": "app", "syslog_url":"yo"}`, http.StatusBadRequest, errors.New(`invalid syslog url: "yo"`)},
-		{datastore.NewMock(), logs.NewMock(), "/v2/apps", `{"name": "app", "syslog_url":"yo://sup.com:1"}`, http.StatusBadRequest, errors.New(`invalid syslog url: "yo://sup.com:1"`)},
+		{datastore.NewMock(), logs.NewMock(), "/v2/apps", `{"name": "app", "syslog_url":"yo://sup.com:1"}`, http.StatusBadRequest, errors.New(`invalid syslog url: "yo://sup.com:1" invalid scheme, only [tcp, udp, unix, unixgram, tcp+tls] are supported`)},
 		// success
 		{datastore.NewMock(), logs.NewMock(), "/v2/apps", `{ "name": "teste"  }`, http.StatusOK, nil},
 		{datastore.NewMock(), logs.NewMock(), "/v2/apps", `{  "name": "teste" , "annotations": {"k1":"v1", "k2":[]}}`, http.StatusOK, nil},