MOD: don't log the error when the request is invalid

server/handlers/middleware.go

@@ -9,7 +9,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/meitu/lmstfy/auth"
 	"github.com/meitu/lmstfy/engine"
-	"github.com/sirupsen/logrus"
 )
 
 func getToken(c *gin.Context) (token string) {
@@ -44,7 +43,6 @@ func SetupQueueEngine(c *gin.Context) {
 }
 
 func ValidateToken(c *gin.Context) {
-	logger := GetHTTPLogger(c)
 	tk := c.GetString("token")
 	if tk == "" {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "token not found"})
@@ -54,17 +52,11 @@ func ValidateToken(c *gin.Context) {
 	tm := auth.GetTokenManager()
 	ok, err := tm.Exist(c.GetString("pool"), c.Param("namespace"), tk)
 	if err != nil {
-		logger.WithField("err", err).Error("Failed to check token")
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "internal error"})
 		c.Abort()
 		return
 	}
 	if !ok {
-		logger.WithFields(logrus.Fields{
-			"pool":      c.GetString("pool"),
-			"namespace": c.Param("namespace"),
-			"token":     tk,
-		}).Info("Invalid token")
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "invalid token"})
 		c.Abort()
 		return

server/handlers/queue.go

@@ -24,30 +24,26 @@ func Publish(c *gin.Context) {
 	delaySecondStr := c.DefaultQuery("delay", DefaultDelay)
 	delaySecond, err := strconv.ParseUint(delaySecondStr, 10, 32)
 	if delaySecond < 0 || err != nil {
-		logger.WithField("delay", delaySecondStr).Warn("Invalid delay")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid delay"})
 		return
 	}
 
 	ttlSecondStr := c.DefaultQuery("ttl", DefaultTTL)
 	ttlSecond, err := strconv.ParseUint(ttlSecondStr, 10, 32)
 	if ttlSecond < 0 || err != nil {
-		logger.WithField("ttl", ttlSecondStr).Warn("Invalid ttl")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid ttl"})
 		return
 	}
 
 	// NOTE: ttlSecond == 0 means forever, so it's always longer than any delay
 	if ttlSecond > 0 && ttlSecond < delaySecond {
-		logger.WithFields(logrus.Fields{"ttl": ttlSecondStr, "delay": delaySecondStr}).Warn("TTL is shorter than delay")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "ttl is shorter than delay"})
 		return
 	}
 
 	triesStr := c.DefaultQuery("tries", DefaultTries)
 	tries, err := strconv.ParseUint(triesStr, 10, 16)
 	if err != nil {
-		logger.WithField("tries", ttlSecondStr).Warn("Invalid tries")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid tries"})
 		return
 	}
@@ -58,7 +54,6 @@ func Publish(c *gin.Context) {
 
 	body, err := c.GetRawData()
 	if err != nil {
-		logger.WithField("err", err).Warn("Failed to read request body")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "failed to read body"})
 		return
 	}
@@ -114,23 +109,20 @@ func Consume(c *gin.Context) {
 	ttrSecondStr := c.DefaultQuery("ttr", DefaultTTR) // Default to 1 minute
 	ttrSecond, err := strconv.ParseUint(ttrSecondStr, 10, 32)
 	if ttrSecond < 0 || err != nil {
-		logger.WithField("ttr", ttrSecondStr).Warn("Invalid ttr")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid ttr"})
 		return
 	}
 
 	timeoutSecondStr := c.DefaultQuery("timeout", DefaultTimeout) // Default non-blocking
 	timeoutSecond, err := strconv.ParseUint(timeoutSecondStr, 10, 32)
 	if timeoutSecond < 0 || err != nil {
-		logger.WithField("timeout", timeoutSecondStr).Warn("Invalid timeout")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid timeout"})
 		return
 	}
 
 	var job engine.Job
 	switch len(queueList) {
 	case 0:
-		logger.WithField("queues", queues).Warn("Invalid queue names")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid queue name(s)"})
 		return
 	case 1:
@@ -142,7 +134,6 @@ func Consume(c *gin.Context) {
 		}
 	default:
 		if timeoutSecond == 0 {
-			logger.Warn("Zero timeout when consuming multiple queues")
 			c.JSON(http.StatusBadRequest, gin.H{"error": "timeout must be provided to consume multiple queues"})
 			return
 		}
@@ -326,15 +317,13 @@ func RespawnDeadLetter(c *gin.Context) {
 	limitStr := c.DefaultQuery("limit", "1")
 	limit, err := strconv.ParseInt(limitStr, 10, 64)
 	if limit <= 0 || err != nil {
-		logger.WithField("limit", limitStr).Info("Invalid limit")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid limit"})
 		return
 	}
 
 	ttlSecondStr := c.DefaultQuery("ttl", DefaultTTL)
 	ttlSecond, err := strconv.ParseInt(ttlSecondStr, 10, 64)
 	if ttlSecond < 0 || err != nil {
-		logger.WithField("ttl", ttlSecondStr).Info("Invalid ttl")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid ttl"})
 		return
 	}
@@ -374,7 +363,6 @@ func DeleteDeadLetter(c *gin.Context) {
 
 	limit, err := strconv.ParseInt(limitStr, 10, 64)
 	if limit <= 0 || err != nil {
-		logger.WithField("limit", limitStr).Info("Invalid limit")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid limit"})
 		return
 	}