mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-21 09:06:46 +09:00
Backport #39661 1. fix #39660: relax email validation 2. fix #39658: use "int64" instead of time.Duration (for JSON v2) Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
1 parent
4ebd5e319b
commit
27bd022b34
4 files changed
+36
-19
No files matched your search
@@ -5,6 +5,7 @@ package private
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"gitea.dev/models/db"
|
||||
"gitea.dev/modules/graceful"
|
||||
@@ -34,7 +35,7 @@ func FlushQueues(ctx *context.PrivateContext) {
|
||||
// Save the hammer ctx here - as a new one is created each time you call this.
|
||||
baseCtx := graceful.GetManager().HammerContext()
|
||||
go func() {
|
||||
err := queue.GetManager().FlushAll(baseCtx, opts.Timeout)
|
||||
err := queue.GetManager().FlushAll(baseCtx, time.Duration(opts.Timeout))
|
||||
if err != nil {
|
||||
log.Error("Flushing request timed-out with error: %v", err)
|
||||
}
|
||||
@@ -44,7 +45,7 @@ func FlushQueues(ctx *context.PrivateContext) {
|
||||
})
|
||||
return
|
||||
}
|
||||
err := queue.GetManager().FlushAll(ctx, opts.Timeout)
|
||||
err := queue.GetManager().FlushAll(ctx, time.Duration(opts.Timeout))
|
||||
if err != nil {
|
||||
ctx.PrivateUserErrorf(http.StatusRequestTimeout, "%v", err)
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user