- don't check weixin exist after login in.

This commit is contained in:
gazebo
2018-09-21 15:35:02 +08:00
parent edd5bfed26
commit 4192e9c635
8 changed files with 69 additions and 50 deletions

View File

@@ -7,6 +7,7 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/globals"
)
const (
@@ -91,6 +92,7 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
}
task.C = task.finishChan
go func() {
globals.SugarLogger.Debugf("RunTask %s", taskName)
for i := 0; i < parallelCount; i++ {
go func() {
var chanRetVal interface{}
@@ -104,19 +106,25 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
chanRetVal = retVal
goto end
} else {
if result, err := worker(job, params...); err == nil {
result, err := worker(job, params...)
globals.SugarLogger.Debugf("RunTask %s, after call worker result:%v, err:%v", taskName, result, err)
if err == nil {
task.finishedOneJob(len(job))
if result != nil {
retVal = append(retVal, utils.Interface2Slice(result)...)
}
} else {
chanRetVal = err
task.Cancel()
go func() {
task.Cancel()
}()
goto end
}
}
}
}
end:
// globals.SugarLogger.Debugf("RunTask %s, put to chann chanRetVal:%v", taskName, chanRetVal)
task.subFinishChan <- chanRetVal
}()
}
@@ -157,6 +165,7 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
task.TerminatedAt = time.Now()
task.locker.Unlock()
globals.SugarLogger.Debugf("RunTask %s, result:%v, err:%v", taskName, taskResult, taskErr)
close(task.finishChan)
close(task.subFinishChan)