Skip to content

Commit 5e63ab8

Browse files
QinYuuuuRader
QinYuuuu
authored and
Rader
committed
Enhance logs
1 parent 5a09a0c commit 5e63ab8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1080
-831
lines changed

‎api/handler/accounting.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ func (ah *AccountingHandler) QueryMeteringStatementByUserID(ctx *gin.Context) {
6868
currentUser := httpbase.GetCurrentUser(ctx)
6969
per, page, err := common.GetPerAndPageFromContext(ctx)
7070
if err != nil {
71-
slog.Error("Bad request format", "error", err)
71+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
7272
httpbase.BadRequest(ctx, err.Error())
7373
return
7474
}
7575
scene, err := getSceneFromContext(ctx)
7676
if err != nil {
77-
slog.Error("Bad request scene format", "error", err)
77+
slog.ErrorContext(ctx.Request.Context(), "Bad request scene format", "error", err)
7878
httpbase.BadRequest(ctx, err.Error())
7979
return
8080
}
@@ -83,12 +83,12 @@ func (ah *AccountingHandler) QueryMeteringStatementByUserID(ctx *gin.Context) {
8383
startTime := ctx.Query("start_time") // format: '2024-06-12 08:27:22'
8484
endTime := ctx.Query("end_time") // format: '2024-06-12 17:17:22'
8585
if len(startTime) < 1 || len(endTime) < 1 || len(userUUID) < 1 {
86-
slog.Error("Bad request format")
86+
slog.ErrorContext(ctx.Request.Context(), "Bad request format")
8787
httpbase.BadRequest(ctx, "Bad request format")
8888
return
8989
}
9090
if !validateDateTimeFormat(startTime, "2006-01-02 15:04:05") || !validateDateTimeFormat(endTime, "2006-01-02 15:04:05") {
91-
slog.Error("Bad request datetime format")
91+
slog.ErrorContext(ctx.Request.Context(), "Bad request datetime format")
9292
httpbase.BadRequest(ctx, "Bad request datetime format")
9393
return
9494
}
@@ -105,7 +105,7 @@ func (ah *AccountingHandler) QueryMeteringStatementByUserID(ctx *gin.Context) {
105105
data, err := ah.accounting.ListMeteringsByUserIDAndTime(ctx.Request.Context(), req)
106106
if err != nil {
107107
errTip := "fail to query meterings by user"
108-
slog.Error(errTip, slog.Any("req", req), slog.Any("error", err))
108+
slog.ErrorContext(ctx.Request.Context(), errTip, slog.Any("req", req), slog.Any("error", err))
109109
httpbase.ServerError(ctx, errors.New(errTip))
110110
return
111111
}

‎api/handler/broadcast.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (h *BroadcastHandler) Index(ctx *gin.Context) {
3535
broadcasts, err := h.ec.AllBroadcasts(ctx.Request.Context())
3636

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

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

8989
activeBroadcast, err := h.ec.ActiveBroadcast(ctx.Request.Context())
9090
if err != nil {
91-
slog.Error("Faild to retrieve active broadcasts", "error", err)
91+
slog.ErrorContext(ctx.Request.Context(), "Faild to retrieve active broadcasts", "error", err)
9292
httpbase.ServerError(ctx, err)
9393
return
9494
}
9595

9696
id, err := strconv.ParseInt(ctx.Param("id"), 10, 64)
9797
if err != nil {
98-
slog.Error("Bad request format", "error", err)
98+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
9999
httpbase.BadRequest(ctx, err.Error())
100100
return
101101
}
102102

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

113113
if err != nil {
114-
slog.Error("Failed to update Broadcast", slog.Any("error", err))
114+
slog.ErrorContext(ctx.Request.Context(), "Failed to update Broadcast", slog.Any("error", err))
115115
httpbase.ServerError(ctx, err)
116116
return
117117
}
@@ -130,13 +130,13 @@ func (h *BroadcastHandler) Update(ctx *gin.Context) {
130130
func (h *BroadcastHandler) Show(ctx *gin.Context) {
131131
id, err := strconv.ParseInt(ctx.Param("id"), 10, 64)
132132
if err != nil {
133-
slog.Error("Bad request format", "error", err)
133+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
134134
httpbase.BadRequest(ctx, err.Error())
135135
return
136136
}
137137
broadcast, err := h.ec.GetBroadcast(ctx.Request.Context(), id)
138138
if err != nil {
139-
slog.Error("Failed to find Broadcast", slog.Any("error", err), "id", id)
139+
slog.ErrorContext(ctx.Request.Context(), "Failed to find Broadcast", slog.Any("error", err), "id", id)
140140
httpbase.ServerError(ctx, err)
141141
return
142142
}
@@ -155,7 +155,7 @@ func (h *BroadcastHandler) Show(ctx *gin.Context) {
155155
func (h *BroadcastHandler) Active(ctx *gin.Context) {
156156
broadcast, err := h.ec.ActiveBroadcast(ctx.Request.Context())
157157
if err != nil {
158-
slog.Error("Failed to find Broadcast", slog.Any("error", err))
158+
slog.ErrorContext(ctx.Request.Context(), "Failed to find Broadcast", slog.Any("error", err))
159159
httpbase.ServerError(ctx, err)
160160
return
161161
}

‎api/handler/callback/git_callback.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (h *GitCallbackHandler) Handle(c *gin.Context) {
3535
case "push":
3636
h.handlePush(c)
3737
default:
38-
slog.Error("Unknown git callback event", "event", event)
38+
slog.ErrorContext(c.Request.Context(), "Unknown git callback event", "event", event)
3939
httpbase.BadRequest(c, "unknown git callback event:"+event)
4040
}
4141

@@ -44,7 +44,7 @@ func (h *GitCallbackHandler) Handle(c *gin.Context) {
4444
func (h *GitCallbackHandler) handlePush(c *gin.Context) {
4545
var req types.GiteaCallbackPushReq
4646
if err := c.ShouldBindJSON(&req); err != nil {
47-
slog.Error("[git_callback] Bad git callback request format", slog.Any("error", err))
47+
slog.ErrorContext(c.Request.Context(), "[git_callback] Bad git callback request format", slog.Any("error", err))
4848
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
4949
return
5050
}
@@ -58,7 +58,7 @@ func (h *GitCallbackHandler) handlePush(c *gin.Context) {
5858
c, workflowOptions, workflow.HandlePushWorkflow, &req,
5959
)
6060
if err != nil {
61-
slog.Error("[git_callback] failed to handle git push callback", slog.Any("error", err), slog.Any("repo_path", req.Repository.FullName))
61+
slog.ErrorContext(c.Request.Context(), "[git_callback] failed to handle git push callback", slog.Any("error", err), slog.Any("repo_path", req.Repository.FullName))
6262
httpbase.ServerError(c, err)
6363
return
6464
}

‎api/handler/cluster.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const (
5050
func (h *ClusterHandler) Index(ctx *gin.Context) {
5151
clusters, err := h.c.Index(ctx.Request.Context())
5252
if err != nil {
53-
slog.Error("Failed to get cluster list", slog.Any("error", err))
53+
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster list", slog.Any("error", err))
5454
httpbase.ServerError(ctx, err)
5555
return
5656
}
@@ -72,7 +72,7 @@ func (h *ClusterHandler) GetClusterById(ctx *gin.Context) {
7272
id := ctx.Param("id")
7373
cluster, err := h.c.GetClusterWithResourceByID(ctx.Request.Context(), id)
7474
if err != nil {
75-
slog.Error("Failed to get cluster", slog.Any("error", err))
75+
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster", slog.Any("error", err))
7676
httpbase.ServerError(ctx, err)
7777
return
7878
}
@@ -93,7 +93,7 @@ func (h *ClusterHandler) GetClusterById(ctx *gin.Context) {
9393
func (h *ClusterHandler) GetClusterUsage(ctx *gin.Context) {
9494
usages, err := h.c.GetClusterUsages(ctx.Request.Context())
9595
if err != nil {
96-
slog.Error("Failed to get cluster usage", slog.Any("error", err))
96+
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster usage", slog.Any("error", err))
9797
httpbase.ServerError(ctx, err)
9898
return
9999
}
@@ -118,7 +118,7 @@ func (h *ClusterHandler) GetClusterUsage(ctx *gin.Context) {
118118
func (h *ClusterHandler) GetDeploys(ctx *gin.Context) {
119119
per, page, err := common.GetPerAndPageFromContext(ctx)
120120
if err != nil {
121-
slog.Error("Bad request format of page and per", slog.Any("error", err))
121+
slog.ErrorContext(ctx.Request.Context(), "Bad request format of page and per", slog.Any("error", err))
122122
httpbase.BadRequestWithExt(ctx, err)
123123
return
124124
}
@@ -138,7 +138,7 @@ func (h *ClusterHandler) GetDeploys(ctx *gin.Context) {
138138
req.Query = ctx.Query("search")
139139
deploys, total, err := h.c.GetDeploys(ctx.Request.Context(), req)
140140
if err != nil {
141-
slog.Error("Failed to get cluster deploys", slog.Any("error", err))
141+
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster deploys", slog.Any("error", err))
142142
httpbase.ServerError(ctx, err)
143143
return
144144
}
@@ -175,7 +175,7 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
175175
}
176176
req.Query = ctx.Query("search")
177177
if err := bindDeployDateRange(ctx, &req); err != nil {
178-
slog.Error("Invalid date range for deploy report", slog.Any("error", err))
178+
slog.ErrorContext(ctx.Request.Context(), "Invalid date range for deploy report", slog.Any("error", err))
179179
httpbase.BadRequest(ctx, err.Error())
180180
return
181181
}
@@ -208,7 +208,7 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
208208
for {
209209
deploys, total, err := h.c.GetDeploys(ctx.Request.Context(), req)
210210
if err != nil {
211-
slog.Error("Failed to get cluster deploys", slog.Any("error", err))
211+
slog.ErrorContext(ctx.Request.Context(), "Failed to get cluster deploys", slog.Any("error", err))
212212
httpbase.ServerError(ctx, err)
213213
return
214214
}
@@ -230,7 +230,7 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
230230

231231
writer.Flush()
232232
if err := writer.Error(); err != nil {
233-
slog.Error("Failed to write csv", slog.Any("error", err))
233+
slog.ErrorContext(ctx.Request.Context(), "Failed to write csv", slog.Any("error", err))
234234
return
235235
}
236236

@@ -246,14 +246,14 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
246246
func (h *ClusterHandler) Update(ctx *gin.Context) {
247247
var req types.ClusterRequest
248248
if err := ctx.ShouldBindJSON(&req); err != nil {
249-
slog.Error("Bad request format", "error", err)
249+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
250250
httpbase.BadRequest(ctx, err.Error())
251251
return
252252
}
253253
req.ClusterID = ctx.Param("id")
254254
result, err := h.c.Update(ctx.Request.Context(), req)
255255
if err != nil {
256-
slog.Error("Failed to update cluster info", slog.Any("error", err))
256+
slog.ErrorContext(ctx.Request.Context(), "Failed to update cluster info", slog.Any("error", err))
257257
httpbase.ServerError(ctx, err)
258258
return
259259
}

‎api/handler/code.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (h *CodeHandler) Create(ctx *gin.Context) {
5959
currentUser := httpbase.GetCurrentUser(ctx)
6060
var req *types.CreateCodeReq
6161
if err := ctx.ShouldBindJSON(&req); err != nil {
62-
slog.Error("Bad request format", "error", err)
62+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
6363
httpbase.BadRequest(ctx, err.Error())
6464
return
6565
}
@@ -70,7 +70,7 @@ func (h *CodeHandler) Create(ctx *gin.Context) {
7070

7171
_, err := h.sensitive.CheckRequestV2(ctx.Request.Context(), req)
7272
if err != nil {
73-
slog.Error("failed to check sensitive request", slog.Any("error", err))
73+
slog.ErrorContext(ctx.Request.Context(), "failed to check sensitive request", slog.Any("error", err))
7474
httpbase.BadRequest(ctx, fmt.Errorf("sensitive check failed: %w", err).Error())
7575
return
7676
}
@@ -83,7 +83,7 @@ func (h *CodeHandler) Create(ctx *gin.Context) {
8383
} else if errors.Is(err, errorx.ErrDatabaseDuplicateKey) {
8484
httpbase.BadRequestWithExt(ctx, err)
8585
} else {
86-
slog.Error("Failed to create code", slog.Any("error", err))
86+
slog.ErrorContext(ctx.Request.Context(), "Failed to create code", slog.Any("error", err))
8787
httpbase.ServerError(ctx, err)
8888
}
8989
return
@@ -120,7 +120,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {
120120
filter.Username = httpbase.GetCurrentUser(ctx)
121121
per, page, err := common.GetPerAndPageFromContext(ctx)
122122
if err != nil {
123-
slog.Error("Bad request format", "error", err)
123+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
124124
httpbase.BadRequest(ctx, err.Error())
125125
return
126126
}
@@ -132,7 +132,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {
132132
Set("param", "sort").
133133
Set("provided", filter.Sort).
134134
Set("allowed", types.Sorts))
135-
slog.Error("Bad request format,", slog.String("error", msg))
135+
slog.ErrorContext(ctx.Request.Context(), "Bad request format,", slog.String("error", msg))
136136
httpbase.BadRequestWithExt(ctx, err)
137137
return
138138
}
@@ -144,7 +144,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {
144144
Set("param", "source").
145145
Set("provided", filter.Source).
146146
Set("allowed", types.Sources))
147-
slog.Error("Bad request format,", slog.String("error", msg))
147+
slog.ErrorContext(ctx.Request.Context(), "Bad request format,", slog.String("error", msg))
148148
httpbase.BadRequestWithExt(ctx, err)
149149
return
150150
}
@@ -157,7 +157,7 @@ func (h *CodeHandler) Index(ctx *gin.Context) {
157157

158158
codes, total, err := h.code.Index(ctx.Request.Context(), filter, per, page, needOpWeight)
159159
if err != nil {
160-
slog.Error("Failed to get codes", slog.Any("error", err))
160+
slog.ErrorContext(ctx.Request.Context(), "Failed to get codes", slog.Any("error", err))
161161
httpbase.ServerError(ctx, err)
162162
return
163163
}
@@ -184,22 +184,22 @@ func (h *CodeHandler) Update(ctx *gin.Context) {
184184
currentUser := httpbase.GetCurrentUser(ctx)
185185
var req *types.UpdateCodeReq
186186
if err := ctx.ShouldBindJSON(&req); err != nil {
187-
slog.Error("Bad request format", "error", err)
187+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
188188
httpbase.BadRequest(ctx, err.Error())
189189
return
190190
}
191191

192192
_, err := h.sensitive.CheckRequestV2(ctx.Request.Context(), req)
193193
if err != nil {
194-
slog.Error("failed to check sensitive request", slog.Any("error", err))
194+
slog.ErrorContext(ctx.Request.Context(), "failed to check sensitive request", slog.Any("error", err))
195195
httpbase.BadRequest(ctx, fmt.Errorf("sensitive check failed: %w", err).Error())
196196
return
197197
}
198198
req.Username = currentUser
199199

200200
namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
201201
if err != nil {
202-
slog.Error("Bad request format", "error", err)
202+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
203203
httpbase.BadRequest(ctx, err.Error())
204204
return
205205
}
@@ -212,7 +212,7 @@ func (h *CodeHandler) Update(ctx *gin.Context) {
212212
httpbase.ForbiddenError(ctx, err)
213213
return
214214
}
215-
slog.Error("Failed to update code", slog.Any("error", err))
215+
slog.ErrorContext(ctx.Request.Context(), "Failed to update code", slog.Any("error", err))
216216
httpbase.ServerError(ctx, err)
217217
return
218218
}
@@ -239,7 +239,7 @@ func (h *CodeHandler) Delete(ctx *gin.Context) {
239239
currentUser := httpbase.GetCurrentUser(ctx)
240240
namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
241241
if err != nil {
242-
slog.Error("Bad request format", "error", err)
242+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
243243
httpbase.BadRequest(ctx, err.Error())
244244
return
245245
}
@@ -249,7 +249,7 @@ func (h *CodeHandler) Delete(ctx *gin.Context) {
249249
httpbase.ForbiddenError(ctx, err)
250250
return
251251
}
252-
slog.Error("Failed to delete code", slog.Any("error", err))
252+
slog.ErrorContext(ctx.Request.Context(), "Failed to delete code", slog.Any("error", err))
253253
httpbase.ServerError(ctx, err)
254254
return
255255
}
@@ -276,7 +276,7 @@ func (h *CodeHandler) Delete(ctx *gin.Context) {
276276
func (h *CodeHandler) Show(ctx *gin.Context) {
277277
namespace, name, err := common.GetNamespaceAndNameFromContext(ctx)
278278
if err != nil {
279-
slog.Error("Bad request format", "error", err)
279+
slog.ErrorContext(ctx.Request.Context(), "Bad request format", "error", err)
280280
httpbase.BadRequest(ctx, err.Error())
281281
return
282282
}
@@ -291,7 +291,7 @@ func (h *CodeHandler) Show(ctx *gin.Context) {
291291
qNeedMultiSync := ctx.Query("need_multi_sync")
292292
needMultiSync, err := strconv.ParseBool(qNeedMultiSync)
293293
if err != nil {
294-
slog.Error("bad need_multi_sync params", slog.Any("need_multi_sync", qNeedMultiSync), slog.Any("error", err))
294+
slog.ErrorContext(ctx.Request.Context(), "bad need_multi_sync params", slog.Any("need_multi_sync", qNeedMultiSync), slog.Any("error", err))
295295
needMultiSync = false
296296
}
297297

@@ -301,7 +301,7 @@ func (h *CodeHandler) Show(ctx *gin.Context) {
301301
httpbase.ForbiddenError(ctx, err)
302302
return
303303
}
304-
slog.Error("Failed to get code", slog.Any("error", err))
304+
slog.ErrorContext(ctx.Request.Context(), "Failed to get code", slog.Any("error", err))
305305
httpbase.ServerError(ctx, err)
306306
return
307307
}
@@ -336,7 +336,7 @@ func (h *CodeHandler) Relations(ctx *gin.Context) {
336336
httpbase.ForbiddenError(ctx, err)
337337
return
338338
}
339-
slog.Error("Failed to get code relations", slog.Any("error", err))
339+
slog.ErrorContext(ctx.Request.Context(), "Failed to get code relations", slog.Any("error", err))
340340
httpbase.ServerError(ctx, err)
341341
return
342342
}

0 commit comments

Comments
 (0)