loading up the forgejo repo on tangled to test page performance
Clean up log messages (#30313)
`log.Xxx("%v")` is not ideal, this PR adds necessary context messages.
Remove some unnecessary logs.
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit 83f83019ef3471b847a300f0821499b3896ec987)
Conflicts:
- modules/util/util.go
Conflict resolved by picking `util.Iif` from 654cfd1dfbd3f3f1d94addee50b6fe2b018a49c3
authored by
wxiaoguang
Giteabot
and committed by
Gergely Nagy
9b8de157
ceba1abe
+38
-44
+1
-1
cmd/web.go
+1
-1
cmd/web.go
···
114
114
log.Info("* WorkPath: %s", setting.AppWorkPath)
115
115
log.Info("* CustomPath: %s", setting.CustomPath)
116
116
log.Info("* ConfigFile: %s", setting.CustomConf)
117
-
log.Info("%s", msg)
117
+
log.Info("%s", msg) // show startup message
118
118
}
119
119
120
120
func serveInstall(ctx *cli.Context) error {
+4
-13
models/asymkey/ssh_key_fingerprint.go
+4
-13
models/asymkey/ssh_key_fingerprint.go
···
76
76
// CalcFingerprint calculate public key's fingerprint
77
77
func CalcFingerprint(publicKeyContent string) (string, error) {
78
78
// Call the method based on configuration
79
-
var (
80
-
fnName, fp string
81
-
err error
82
-
)
83
-
if len(setting.SSH.KeygenPath) == 0 {
84
-
fnName = "calcFingerprintNative"
85
-
fp, err = calcFingerprintNative(publicKeyContent)
86
-
} else {
87
-
fnName = "calcFingerprintSSHKeygen"
88
-
fp, err = calcFingerprintSSHKeygen(publicKeyContent)
89
-
}
79
+
useNative := setting.SSH.KeygenPath == ""
80
+
calcFn := util.Iif(useNative, calcFingerprintNative, calcFingerprintSSHKeygen)
81
+
fp, err := calcFn(publicKeyContent)
90
82
if err != nil {
91
83
if IsErrKeyUnableVerify(err) {
92
-
log.Info("%s", publicKeyContent)
93
84
return "", err
94
85
}
95
-
return "", fmt.Errorf("%s: %w", fnName, err)
86
+
return "", fmt.Errorf("CalcFingerprint(%s): %w", util.Iif(useNative, "native", "ssh-keygen"), err)
96
87
}
97
88
return fp, nil
98
89
}
+1
-1
models/repo/issue.go
+1
-1
models/repo/issue.go
+8
modules/util/util.go
+8
modules/util/util.go
···
213
213
return &val
214
214
}
215
215
216
+
// Iif is an "inline-if", it returns "trueVal" if "condition" is true, otherwise "falseVal"
217
+
func Iif[T any](condition bool, trueVal, falseVal T) T {
218
+
if condition {
219
+
return trueVal
220
+
}
221
+
return falseVal
222
+
}
223
+
216
224
func ReserveLineBreakForTextarea(input string) string {
217
225
// Since the content is from a form which is a textarea, the line endings are \r\n.
218
226
// It's a standard behavior of HTML.
+8
-8
routers/private/actions.go
+8
-8
routers/private/actions.go
···
27
27
defer rd.Close()
28
28
29
29
if err := json.NewDecoder(rd).Decode(&genRequest); err != nil {
30
-
log.Error("%v", err)
30
+
log.Error("JSON Decode failed: %v", err)
31
31
ctx.JSON(http.StatusInternalServerError, private.Response{
32
32
Err: err.Error(),
33
33
})
···
36
36
37
37
owner, repo, err := parseScope(ctx, genRequest.Scope)
38
38
if err != nil {
39
-
log.Error("%v", err)
39
+
log.Error("parseScope failed: %v", err)
40
40
ctx.JSON(http.StatusInternalServerError, private.Response{
41
41
Err: err.Error(),
42
42
})
···
46
46
if errors.Is(err, util.ErrNotExist) || (token != nil && !token.IsActive) {
47
47
token, err = actions_model.NewRunnerToken(ctx, owner, repo)
48
48
if err != nil {
49
-
err := fmt.Sprintf("error while creating runner token: %v", err)
50
-
log.Error("%v", err)
49
+
errMsg := fmt.Sprintf("error while creating runner token: %v", err)
50
+
log.Error("NewRunnerToken failed: %v", errMsg)
51
51
ctx.JSON(http.StatusInternalServerError, private.Response{
52
-
Err: err,
52
+
Err: errMsg,
53
53
})
54
54
return
55
55
}
56
56
} else if err != nil {
57
-
err := fmt.Sprintf("could not get unactivated runner token: %v", err)
58
-
log.Error("%v", err)
57
+
errMsg := fmt.Sprintf("could not get unactivated runner token: %v", err)
58
+
log.Error("GetLatestRunnerToken failed: %v", errMsg)
59
59
ctx.JSON(http.StatusInternalServerError, private.Response{
60
-
Err: err,
60
+
Err: errMsg,
61
61
})
62
62
return
63
63
}
+1
-2
routers/private/hook_verification.go
+1
-2
routers/private/hook_verification.go
···
47
47
_ = stdoutWriter.Close()
48
48
err := readAndVerifyCommitsFromShaReader(stdoutReader, repo, env)
49
49
if err != nil {
50
-
log.Error("%v", err)
50
+
log.Error("readAndVerifyCommitsFromShaReader failed: %v", err)
51
51
cancel()
52
52
}
53
53
_ = stdoutReader.Close()
···
66
66
line := scanner.Text()
67
67
err := readAndVerifyCommit(line, repo, env)
68
68
if err != nil {
69
-
log.Error("%v", err)
70
69
return err
71
70
}
72
71
}
+1
-1
routers/private/mail.go
+1
-1
routers/private/mail.go
-1
routers/web/admin/users.go
-1
routers/web/admin/users.go
···
403
403
ctx.Data["Err_Password"] = true
404
404
ctx.RenderWithErr(ctx.Tr("auth.password_pwned"), tplUserEdit, &form)
405
405
case password.IsErrIsPwnedRequest(err):
406
-
log.Error("%s", err.Error())
407
406
ctx.Data["Err_Password"] = true
408
407
ctx.RenderWithErr(ctx.Tr("auth.password_pwned_err"), tplUserEdit, &form)
409
408
default:
-2
routers/web/auth/password.go
-2
routers/web/auth/password.go
···
214
214
case errors.Is(err, password.ErrIsPwned):
215
215
ctx.RenderWithErr(ctx.Tr("auth.password_pwned"), tplResetPassword, nil)
216
216
case password.IsErrIsPwnedRequest(err):
217
-
log.Error("%s", err.Error())
218
217
ctx.RenderWithErr(ctx.Tr("auth.password_pwned_err"), tplResetPassword, nil)
219
218
default:
220
219
ctx.ServerError("UpdateAuth", err)
···
298
297
ctx.Data["Err_Password"] = true
299
298
ctx.RenderWithErr(ctx.Tr("auth.password_pwned"), tplMustChangePassword, &form)
300
299
case password.IsErrIsPwnedRequest(err):
301
-
log.Error("%s", err.Error())
302
300
ctx.Data["Err_Password"] = true
303
301
ctx.RenderWithErr(ctx.Tr("auth.password_pwned_err"), tplMustChangePassword, &form)
304
302
default:
-1
routers/web/user/setting/account.go
-1
routers/web/user/setting/account.go
+2
-2
services/context/captcha.go
+2
-2
services/context/captcha.go
···
79
79
case setting.CfTurnstile:
80
80
valid, err = turnstile.Verify(ctx, ctx.Req.Form.Get(cfTurnstileResponseField))
81
81
default:
82
-
ctx.ServerError("Unknown Captcha Type", fmt.Errorf("Unknown Captcha Type: %s", setting.Service.CaptchaType))
82
+
ctx.ServerError("Unknown Captcha Type", fmt.Errorf("unknown Captcha Type: %s", setting.Service.CaptchaType))
83
83
return
84
84
}
85
85
if err != nil {
86
-
log.Debug("%v", err)
86
+
log.Debug("Captcha Verify failed: %v", err)
87
87
}
88
88
89
89
if !valid {
+2
-2
services/notify/notify.go
+2
-2
services/notify/notify.go
···
91
91
// NewPullRequest notifies new pull request to notifiers
92
92
func NewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User) {
93
93
if err := pr.LoadIssue(ctx); err != nil {
94
-
log.Error("%v", err)
94
+
log.Error("LoadIssue failed: %v", err)
95
95
return
96
96
}
97
97
if err := pr.Issue.LoadPoster(ctx); err != nil {
···
112
112
// PullRequestReview notifies new pull request review
113
113
func PullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
114
114
if err := review.LoadReviewer(ctx); err != nil {
115
-
log.Error("%v", err)
115
+
log.Error("LoadReviewer failed: %v", err)
116
116
return
117
117
}
118
118
for _, notifier := range notifiers {
+1
-1
services/repository/files/cherry_pick.go
+1
-1
services/repository/files/cherry_pick.go
+1
-1
services/repository/files/patch.go
+1
-1
services/repository/files/patch.go
+1
-1
services/repository/files/update.go
+1
-1
services/repository/files/update.go
+7
-7
services/wiki/wiki.go
+7
-7
services/wiki/wiki.go
···
209
209
if isOldWikiExist {
210
210
err := gitRepo.RemoveFilesFromIndex(oldWikiPath)
211
211
if err != nil {
212
-
log.Error("%v", err)
212
+
log.Error("RemoveFilesFromIndex failed: %v", err)
213
213
return err
214
214
}
215
215
}
···
219
219
220
220
objectHash, err := gitRepo.HashObject(strings.NewReader(content))
221
221
if err != nil {
222
-
log.Error("%v", err)
222
+
log.Error("HashObject failed: %v", err)
223
223
return err
224
224
}
225
225
226
226
if err := gitRepo.AddObjectToIndex("100644", objectHash, newWikiPath); err != nil {
227
-
log.Error("%v", err)
227
+
log.Error("AddObjectToIndex failed: %v", err)
228
228
return err
229
229
}
230
230
231
231
tree, err := gitRepo.WriteTree()
232
232
if err != nil {
233
-
log.Error("%v", err)
233
+
log.Error("WriteTree failed: %v", err)
234
234
return err
235
235
}
236
236
···
255
255
256
256
commitHash, err := gitRepo.CommitTree(doer.NewGitSig(), committer, tree, commitTreeOpts)
257
257
if err != nil {
258
-
log.Error("%v", err)
258
+
log.Error("CommitTree failed: %v", err)
259
259
return err
260
260
}
261
261
···
270
270
0,
271
271
),
272
272
}); err != nil {
273
-
log.Error("%v", err)
273
+
log.Error("Push failed: %v", err)
274
274
if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) {
275
275
return err
276
276
}
277
-
return fmt.Errorf("Push: %w", err)
277
+
return fmt.Errorf("failed to push: %w", err)
278
278
}
279
279
280
280
return nil