From 578f73c7913a0aecbfe7a0c91c97c2d26b3ca9d5 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 12 Jul 2016 12:53:01 +0200 Subject: [PATCH 1/4] Make badgeNone usable in HTML img tag (returning 200 instead of 404) Also adds a print in the log about the kind of failure --- server/badge.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/badge.go b/server/badge.go index acece2356..d3b02acec 100644 --- a/server/badge.go +++ b/server/badge.go @@ -2,6 +2,7 @@ package server import ( "fmt" + "log" "github.com/gin-gonic/gin" @@ -42,7 +43,8 @@ func GetBadge(c *gin.Context) { build, err := store.GetBuildLast(c, repo, branch) if err != nil { - c.String(404, badgeNone) + log.Println(err) + c.String(200, badgeNone) return } @@ -56,7 +58,7 @@ func GetBadge(c *gin.Context) { case model.StatusPending, model.StatusRunning: c.String(200, badgeStarted) default: - c.String(404, badgeNone) + c.String(200, badgeNone) } } From 042e779e08b801e758b0892fb9583e5e562aa788 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 12 Jul 2016 13:28:02 +0200 Subject: [PATCH 2/4] Use Sirupsen/logrus for logs --- server/badge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/badge.go b/server/badge.go index d3b02acec..4dc0281fd 100644 --- a/server/badge.go +++ b/server/badge.go @@ -2,7 +2,7 @@ package server import ( "fmt" - "log" + log "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" @@ -43,7 +43,7 @@ func GetBadge(c *gin.Context) { build, err := store.GetBuildLast(c, repo, branch) if err != nil { - log.Println(err) + log.Error(err) c.String(200, badgeNone) return } From 7dbeb6f42ede13710f4fae5c3c79b1bd809ce52e Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 12 Jul 2016 13:43:32 +0200 Subject: [PATCH 3/4] Use Warning instead of Error on sql failure in badge --- server/badge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/badge.go b/server/badge.go index 4dc0281fd..eb93d866d 100644 --- a/server/badge.go +++ b/server/badge.go @@ -43,7 +43,7 @@ func GetBadge(c *gin.Context) { build, err := store.GetBuildLast(c, repo, branch) if err != nil { - log.Error(err) + log.Warning(err) c.String(200, badgeNone) return } From a24f584336e12bda0d9a7d1a547245f9d2ffaa57 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 12 Jul 2016 13:51:25 +0200 Subject: [PATCH 4/4] Separate core imports from external ones --- server/badge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/badge.go b/server/badge.go index eb93d866d..ed3947de8 100644 --- a/server/badge.go +++ b/server/badge.go @@ -2,8 +2,8 @@ package server import ( "fmt" - log "github.com/Sirupsen/logrus" + log "github.com/Sirupsen/logrus" "github.com/gin-gonic/gin" "github.com/drone/drone/model"