Skip to content

Enhance logs #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rader merged 1 commit into from
Dec 12, 2025
Merged

Enhance logs #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions api/handler/accounting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ func (ah *AccountingHandler) QueryMeteringStatementByUserID(ctx *gin.Context) {
currentUser := httpbase.GetCurrentUser(ctx)
per, page, err := common.GetPerAndPageFromContext(ctx)
if err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
scene, err := getSceneFromContext(ctx)
if err != nil {
slog.Error("Bad request scene format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request scene format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
Expand All @@ -83,12 +83,12 @@ func (ah *AccountingHandler) QueryMeteringStatementByUserID(ctx *gin.Context) {
startTime := ctx.Query("start_time") // format: '2024-06-12 08:27:22'
endTime := ctx.Query("end_time") // format: '2024-06-12 17:17:22'
if len(startTime) < 1 || len(endTime) < 1 || len(userUUID) < 1 {
slog.Error("Bad request format")
slog.ErrorContext(ctx.Request.Context(), "Bad request format")
httpbase.BadRequest(ctx, "Bad request format")
return
}
if !validateDateTimeFormat(startTime, "2006-01-02 15:04:05") || !validateDateTimeFormat(endTime, "2006-01-02 15:04:05") {
slog.Error("Bad request datetime format")
slog.ErrorContext(ctx.Request.Context(), "Bad request datetime format")
httpbase.BadRequest(ctx, "Bad request datetime format")
return
}
Expand All @@ -105,7 +105,7 @@ func (ah *AccountingHandler) QueryMeteringStatementByUserID(ctx *gin.Context) {
data, err := ah.accounting.ListMeteringsByUserIDAndTime(ctx.Request.Context(), req)
if err != nil {
errTip := "fail to query meterings by user"
slog.Error(errTip, slog.Any("req", req), slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), errTip, slog.Any("req", req), slog.Any("error", err))
httpbase.ServerError(ctx, errors.New(errTip))
return
}
Expand Down
18 changes: 9 additions & 9 deletions api/handler/broadcast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (h *BroadcastHandler) Index(ctx *gin.Context) {
broadcasts, err := h.ec.AllBroadcasts(ctx.Request.Context())

if err != nil {
slog.Error("failed to find broadcasts", "error", err)
slog.ErrorContext(ctx.Request.Context(), "failed to find broadcasts", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
Expand All @@ -62,7 +62,7 @@ func (h *BroadcastHandler) Create(ctx *gin.Context) {
}

if err := h.ec.NewBroadcast(ctx.Request.Context(), broadcast); err != nil {
slog.Error("Failed to create events", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to create events", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -88,20 +88,20 @@ func (h *BroadcastHandler) Update(ctx *gin.Context) {

activeBroadcast, err := h.ec.ActiveBroadcast(ctx.Request.Context())
if err != nil {
slog.Error("Faild to retrieve active broadcasts", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Faild to retrieve active broadcasts", "error", err)
httpbase.ServerError(ctx, err)
return
}

id, err := strconv.ParseInt(ctx.Param("id"), 10, 64)
if err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}

if broadcast.Status == "active" && activeBroadcast != nil && activeBroadcast.ID != id {
slog.Error("Bad request format", "error", "Active Broadcast exits")
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", "Active Broadcast exits")
httpbase.BadRequest(ctx, "Active Broadcast exits")
return
}
Expand All @@ -111,7 +111,7 @@ func (h *BroadcastHandler) Update(ctx *gin.Context) {
_, err = h.ec.UpdateBroadcast(ctx.Request.Context(), broadcast)

if err != nil {
slog.Error("Failed to update Broadcast", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to update Broadcast", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -130,13 +130,13 @@ func (h *BroadcastHandler) Update(ctx *gin.Context) {
func (h *BroadcastHandler) Show(ctx *gin.Context) {
id, err := strconv.ParseInt(ctx.Param("id"), 10, 64)
if err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
broadcast, err := h.ec.GetBroadcast(ctx.Request.Context(), id)
if err != nil {
slog.Error("Failed to find Broadcast", slog.Any("error", err), "id", id)
slog.ErrorContext(ctx.Request.Context(), "Failed to find Broadcast", slog.Any("error", err), "id", id)
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -155,7 +155,7 @@ func (h *BroadcastHandler) Show(ctx *gin.Context) {
func (h *BroadcastHandler) Active(ctx *gin.Context) {
broadcast, err := h.ec.ActiveBroadcast(ctx.Request.Context())
if err != nil {
slog.Error("Failed to find Broadcast", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to find Broadcast", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand Down
6 changes: 3 additions & 3 deletions api/handler/callback/git_callback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (h *GitCallbackHandler) Handle(c *gin.Context) {
case "push":
h.handlePush(c)
default:
slog.Error("Unknown git callback event", "event", event)
slog.ErrorContext(c.Request.Context(), "Unknown git callback event", "event", event)
httpbase.BadRequest(c, "unknown git callback event:"+event)
}

Expand All @@ -44,7 +44,7 @@ func (h *GitCallbackHandler) Handle(c *gin.Context) {
func (h *GitCallbackHandler) handlePush(c *gin.Context) {
var req types.GiteaCallbackPushReq
if err := c.ShouldBindJSON(&req); err != nil {
slog.Error("[git_callback] Bad git callback request format", slog.Any("error", err))
slog.ErrorContext(c.Request.Context(), "[git_callback] Bad git callback request format", slog.Any("error", err))
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
return
}
Expand All @@ -58,7 +58,7 @@ func (h *GitCallbackHandler) handlePush(c *gin.Context) {
c, workflowOptions, workflow.HandlePushWorkflow, &req,
)
if err != nil {
slog.Error("[git_callback] failed to handle git push callback", slog.Any("error", err), slog.Any("repo_path", req.Repository.FullName))
slog.ErrorContext(c.Request.Context(), "[git_callback] failed to handle git push callback", slog.Any("error", err), slog.Any("repo_path", req.Repository.FullName))
httpbase.ServerError(c, err)
return
}
Expand Down
20 changes: 10 additions & 10 deletions api/handler/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const (
func (h *ClusterHandler) Index(ctx *gin.Context) {
clusters, err := h.c.Index(ctx.Request.Context())
if err != nil {
slog.Error("Failed to get cluster list", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster list", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -72,7 +72,7 @@ func (h *ClusterHandler) GetClusterById(ctx *gin.Context) {
id := ctx.Param("id")
cluster, err := h.c.GetClusterWithResourceByID(ctx.Request.Context(), id)
if err != nil {
slog.Error("Failed to get cluster", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -93,7 +93,7 @@ func (h *ClusterHandler) GetClusterById(ctx *gin.Context) {
func (h *ClusterHandler) GetClusterUsage(ctx *gin.Context) {
usages, err := h.c.GetClusterUsages(ctx.Request.Context())
if err != nil {
slog.Error("Failed to get cluster usage", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster usage", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -118,7 +118,7 @@ func (h *ClusterHandler) GetClusterUsage(ctx *gin.Context) {
func (h *ClusterHandler) GetDeploys(ctx *gin.Context) {
per, page, err := common.GetPerAndPageFromContext(ctx)
if err != nil {
slog.Error("Bad request format of page and per", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Bad request format of page and per", slog.Any("error", err))
httpbase.BadRequestWithExt(ctx, err)
return
}
Expand All @@ -138,7 +138,7 @@ func (h *ClusterHandler) GetDeploys(ctx *gin.Context) {
req.Query = ctx.Query("search")
deploys, total, err := h.c.GetDeploys(ctx.Request.Context(), req)
if err != nil {
slog.Error("Failed to get cluster deploys", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster deploys", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand Down Expand Up @@ -175,7 +175,7 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
}
req.Query = ctx.Query("search")
if err := bindDeployDateRange(ctx, &req); err != nil {
slog.Error("Invalid date range for deploy report", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Invalid date range for deploy report", slog.Any("error", err))
httpbase.BadRequest(ctx, err.Error())
return
}
Expand Down Expand Up @@ -208,7 +208,7 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
for {
deploys, total, err := h.c.GetDeploys(ctx.Request.Context(), req)
if err != nil {
slog.Error("Failed to get cluster deploys", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster deploys", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -230,7 +230,7 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {

writer.Flush()
if err := writer.Error(); err != nil {
slog.Error("Failed to write csv", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to write csv", slog.Any("error", err))
return
}

Expand All @@ -246,14 +246,14 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
func (h *ClusterHandler) Update(ctx *gin.Context) {
var req types.ClusterRequest
if err := ctx.ShouldBindJSON(&req); err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
req.ClusterID = ctx.Param("id")
result, err := h.c.Update(ctx.Request.Context(), req)
if err != nil {
slog.Error("Failed to update cluster info", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to update cluster info", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand Down
34 changes: 17 additions & 17 deletions api/handler/code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (h *CodeHandler) Create(ctx *gin.Context) {
currentUser := httpbase.GetCurrentUser(ctx)
var req *types.CreateCodeReq
if err := ctx.ShouldBindJSON(&req); err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
Expand All @@ -70,7 +70,7 @@ func (h *CodeHandler) Create(ctx *gin.Context) {

_, err := h.sensitive.CheckRequestV2(ctx.Request.Context(), req)
if err != nil {
slog.Error("failed to check sensitive request", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "failed to check sensitive request", slog.Any("error", err))
httpbase.BadRequest(ctx, fmt.Errorf("sensitive check failed: %w", err).Error())
return
}
Expand All @@ -83,7 +83,7 @@ func (h *CodeHandler) Create(ctx *gin.Context) {
} else if errors.Is(err, errorx.ErrDatabaseDuplicateKey) {
httpbase.BadRequestWithExt(ctx, err)
} else {
slog.Error("Failed to create code", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to create code", slog.Any("error", err))
httpbase.ServerError(ctx, err)
}
return
Expand Down Expand Up @@ -120,7 +120,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {
filter.Username = httpbase.GetCurrentUser(ctx)
per, page, err := common.GetPerAndPageFromContext(ctx)
if err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
Expand All @@ -132,7 +132,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {
Set("param", "sort").
Set("provided", filter.Sort).
Set("allowed", types.Sorts))
slog.Error("Bad request format,", slog.String("error", msg))
slog.ErrorContext(ctx.Request.Context(), "Bad request format,", slog.String("error", msg))
httpbase.BadRequestWithExt(ctx, err)
return
}
Expand All @@ -144,7 +144,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {
Set("param", "source").
Set("provided", filter.Source).
Set("allowed", types.Sources))
slog.Error("Bad request format,", slog.String("error", msg))
slog.ErrorContext(ctx.Request.Context(), "Bad request format,", slog.String("error", msg))
httpbase.BadRequestWithExt(ctx, err)
return
}
Expand All @@ -157,7 +157,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {

codes, total, err := h.code.Index(ctx.Request.Context(), filter, per, page, needOpWeight)
if err != nil {
slog.Error("Failed to get codes", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get codes", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -184,22 +184,22 @@ func (h *CodeHandler) Update(ctx *gin.Context) {
currentUser := httpbase.GetCurrentUser(ctx)
var req *types.UpdateCodeReq
if err := ctx.ShouldBindJSON(&req); err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}

_, err := h.sensitive.CheckRequestV2(ctx.Request.Context(), req)
if err != nil {
slog.Error("failed to check sensitive request", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "failed to check sensitive request", slog.Any("error", err))
httpbase.BadRequest(ctx, fmt.Errorf("sensitive check failed: %w", err).Error())
return
}
req.Username = currentUser

namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
if err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
Expand All @@ -212,7 +212,7 @@ func (h *CodeHandler) Update(ctx *gin.Context) {
httpbase.ForbiddenError(ctx, err)
return
}
slog.Error("Failed to update code", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to update code", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -239,7 +239,7 @@ func (h *CodeHandler) Delete(ctx *gin.Context) {
currentUser := httpbase.GetCurrentUser(ctx)
namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
if err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
Expand All @@ -249,7 +249,7 @@ func (h *CodeHandler) Delete(ctx *gin.Context) {
httpbase.ForbiddenError(ctx, err)
return
}
slog.Error("Failed to delete code", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to delete code", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand All @@ -276,7 +276,7 @@ func (h *CodeHandler) Delete(ctx *gin.Context) {
func (h *CodeHandler) Show(ctx *gin.Context) {
namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
if err != nil {
slog.Error("Bad request format", "error", err)
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
httpbase.BadRequest(ctx, err.Error())
return
}
Expand All @@ -291,7 +291,7 @@ func (h *CodeHandler) Show(ctx *gin.Context) {
qNeedMultiSync := ctx.Query("need_multi_sync")
needMultiSync, err := strconv.ParseBool(qNeedMultiSync)
if err != nil {
slog.Error("bad need_multi_sync params", slog.Any("need_multi_sync", qNeedMultiSync), slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "bad need_multi_sync params", slog.Any("need_multi_sync", qNeedMultiSync), slog.Any("error", err))
needMultiSync = false
}

Expand All @@ -301,7 +301,7 @@ func (h *CodeHandler) Show(ctx *gin.Context) {
httpbase.ForbiddenError(ctx, err)
return
}
slog.Error("Failed to get code", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get code", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand Down Expand Up @@ -336,7 +336,7 @@ func (h *CodeHandler) Relations(ctx *gin.Context) {
httpbase.ForbiddenError(ctx, err)
return
}
slog.Error("Failed to get code relations", slog.Any("error", err))
slog.ErrorContext(ctx.Request.Context(), "Failed to get code relations", slog.Any("error", err))
httpbase.ServerError(ctx, err)
return
}
Expand Down
Loading
Loading