server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix DeepSource and CHANGELOG.md

Browse Source
This commit is contained in:
guoxingyong 2021-05-26 13:37:09 +08:00
parent 7419ad952d
commit 003434cad6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -48,6 +48,7 @@
- Optimize AddAutoPrefix: only register one router in case-insensitive mode. [4582](https://github.com/beego/beego/pull/4582) - Optimize AddAutoPrefix: only register one router in case-insensitive mode. [4582](https://github.com/beego/beego/pull/4582)
- Init exceptMethod by using reflection. [4583](https://github.com/beego/beego/pull/4583) - Init exceptMethod by using reflection. [4583](https://github.com/beego/beego/pull/4583)
- Deprecated BeeMap and replace all usage with `sync.map` [4616](https://github.com/beego/beego/pull/4616) - Deprecated BeeMap and replace all usage with `sync.map` [4616](https://github.com/beego/beego/pull/4616)
- TaskManager support graceful shutdown [4635](https://github.com/beego/beego/pull/4635)
## Fix Sonar ## Fix Sonar

3
task/task.go
View File

@ -557,9 +557,9 @@ func (m *taskManager) runNextTasks(sortList *MapSorter, effective time.Time) {
// check if timeout is on, if yes passing the timeout context // check if timeout is on, if yes passing the timeout context
ctx := context.Background() ctx := context.Background()
m.wait.Add(1)
if duration := e.GetTimeout(ctx); duration != 0 { if duration := e.GetTimeout(ctx); duration != 0 {
go func(e Tasker) { go func(e Tasker) {
m.wait.Add(1)
defer m.wait.Done() defer m.wait.Done()
ctx, cancelFunc := context.WithTimeout(ctx, duration) ctx, cancelFunc := context.WithTimeout(ctx, duration)
defer cancelFunc() defer cancelFunc()
@ -570,7 +570,6 @@ func (m *taskManager) runNextTasks(sortList *MapSorter, effective time.Time) {
}(e) }(e)
} else { } else {
go func(e Tasker) { go func(e Tasker) {
m.wait.Add(1)
defer m.wait.Done() defer m.wait.Done()
err := e.Run(ctx) err := e.Run(ctx)
if err != nil { if err != nil {