From 021745ae92988995adced1f1c3243a5e8db11e3d Mon Sep 17 00:00:00 2001 From: Ross McDonald Date: Wed, 7 Dec 2016 13:22:53 -0600 Subject: [PATCH 1/2] Switch to new build image with Go 1.7.4. --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f636dc1bf..1e25034c1 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ machine: services: - docker environment: - DOCKER_TAG: chronograf-20161121 + DOCKER_TAG: chronograf-20161207 dependencies: override: From a6cb4a19354fa54143410ac8d665303b3477e47a Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Wed, 7 Dec 2016 13:28:58 -0600 Subject: [PATCH 2/2] Update teapot to be informational --- server/users.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/users.go b/server/users.go index ad2450f17..ec5c02119 100644 --- a/server/users.go +++ b/server/users.go @@ -148,8 +148,8 @@ func getEmail(ctx context.Context) (string, error) { func (h *Service) Me(w http.ResponseWriter, r *http.Request) { ctx := r.Context() if !h.UseAuth { - Error(w, http.StatusTeapot, fmt.Sprintf("%v", "Go to line 151 users.go. Look for Arnold"), h.Logger) - _ = 42 // did you mean to learn the answer? if so go to line aslfjasdlfja; (gee willickers.... tbc) + // Using status code to signal no need for authentication + w.WriteHeader(http.StatusTeapot) return } email, err := getEmail(ctx)