mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-09-19 19:28:47 +00:00
Clean up logging (#3161)
- use `Err` method instead of format strings - use `Msg` if no format string is used
This commit is contained in:
@@ -23,6 +23,7 @@ import (
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/rs/zerolog/log"
|
||||
|
||||
"go.woodpecker-ci.org/woodpecker/v2/server"
|
||||
|
||||
"go.woodpecker-ci.org/woodpecker/v2/server/model"
|
||||
@@ -73,7 +74,7 @@ func SetRepo() gin.HandlerFunc {
|
||||
}
|
||||
|
||||
// debugging
|
||||
log.Debug().Err(err).Msgf("Cannot find repository %s.", fullName)
|
||||
log.Debug().Err(err).Msgf("Cannot find repository %s", fullName)
|
||||
|
||||
if user == nil {
|
||||
c.AbortWithStatus(http.StatusUnauthorized)
|
||||
@@ -112,8 +113,8 @@ func SetPerm() gin.HandlerFunc {
|
||||
var err error
|
||||
perm, err = _store.PermFind(user, repo)
|
||||
if err != nil {
|
||||
log.Error().Msgf("Error fetching permission for %s %s. %s",
|
||||
user.Login, repo.FullName, err)
|
||||
log.Error().Err(err).Msgf("Error fetching permission for %s %s",
|
||||
user.Login, repo.FullName)
|
||||
}
|
||||
if time.Unix(perm.Synced, 0).Add(time.Hour).Before(time.Now()) {
|
||||
_repo, err := server.Config.Services.Forge.Repo(c, user, repo.ForgeRemoteID, repo.Owner, repo.Name)
|
||||
|
@@ -147,7 +147,7 @@ func MustOrgMember(admin bool) gin.HandlerFunc {
|
||||
|
||||
perm, err := server.Config.Services.Membership.Get(c, user, org.Name)
|
||||
if err != nil {
|
||||
log.Error().Msgf("Failed to check membership: %v", err)
|
||||
log.Error().Err(err).Msg("Failed to check membership")
|
||||
c.String(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
|
||||
c.Abort()
|
||||
return
|
||||
|
Reference in New Issue
Block a user