liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-10-17 14:06:23 +08:00
parent 0695aa132c
commit 53fe97cbc1
49 changed files with 78 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxutils/tasksch/parallel_task.go
View File

@@ -6,7 +6,6 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/globals"
)
const (
@@ -107,7 +106,6 @@ func NewParallelTask(taskName string, config *ParallelConfig, ctx *jxcontext.Con
func (task *ParallelTask) Run() {
task.run(func() {
globals.SugarLogger.Debugf("ParallelTask.Run %s", task.Name)
for i := 0; i < task.ParallelCount; i++ {
utils.CallFuncAsync(func() {
var chanRetVal interface{}

2
business/jxutils/tasksch/sequence_task.go
View File

@@ -3,7 +3,6 @@ package tasksch
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/globals"
)
const (
@@ -32,7 +31,6 @@ func NewSeqTask2(taskName string, ctx *jxcontext.Context, isContinueWhenError bo
func (task *SeqTask) Run() {
task.run(func() {
globals.SugarLogger.Debugf("SeqTask.Run %s", task.Name)
var taskErr error
var taskResult []interface{}
for i := 0; i < task.TotalItemCount; i++ {

4
business/jxutils/tasksch/task.go
View File

@@ -459,7 +459,6 @@ func (t *BaseTask) run(taskHandler func()) {
task.TerminatedAt = time.Now()
task.locker.Unlock()
task.Error()
globals.SugarLogger.Debugf("Task:%s, mainErr:%v, batchErrList:%v", task.Name, task.mainErr, task.batchErrList)
select {
case <-t.quitChan:
@@ -484,7 +483,6 @@ func (t *BaseTask) run(taskHandler func()) {
func SendMessage(t *BaseTask) {
time.Sleep(10 * time.Millisecond) // 等待GetResult中的isGetResultCalled赋值
globals.SugarLogger.Debugf("BaseTask task ID:%s, name:%s finished, isGetResultCalled:%t", t.ID, t.Name, t.isGetResultCalled)
if !t.isGetResultCalled && t.parent == nil && len(GetTasks(t.ID, TaskStatusBegin, TaskStatusEnd, 24, "")) > 0 {
if authInfo, err := t.ctx.GetV2AuthInfo(); err == nil { // 这里应该是不管登录类型，直接以可能的方式发消息
var content string
@@ -540,7 +538,6 @@ func (t *BaseTask) setStatus(status int) {
func (task *BaseTask) callWorker(worker func() (retVal interface{}, err error)) (retVal interface{}, err error) {
defer func() {
if r := recover(); r != nil {
globals.SugarLogger.Errorf("callWorker panic:%v", r)
err = fmt.Errorf("panic, r:%v", r)
}
}()
@@ -550,7 +547,6 @@ func (task *BaseTask) callWorker(worker func() (retVal interface{}, err error))
func (task *BaseTask) callWorker2(worker func() (retVal interface{}, successCount int, err error)) (retVal interface{}, successCount int, err error) {
defer func() {
if r := recover(); r != nil {
globals.SugarLogger.Errorf("callWorker panic:%v", r)
err = fmt.Errorf("panic, r:%v", r)
}
}()