- big refactor tasksch

This commit is contained in:
gazebo
2018-10-20 15:05:02 +08:00
parent 2bfa5fe17f
commit 0d5a5189ed
15 changed files with 210 additions and 184 deletions

View File

@@ -25,7 +25,7 @@ type tUploadFileInfo struct {
StoreID int
}
func SendFilesToStores(files []*multipart.FileHeader, isAsync bool, userName string) (msg string, err error) {
func SendFilesToStores(files []*multipart.FileHeader, isAsync bool, userName string) (hint string, err error) {
globals.SugarLogger.Debugf("SendFilesToStores, fileCount:%d isAsync:%t, userName:%s", len(files), isAsync, userName)
if len(files) == 0 {
return "", errors.New("没有文件上传!")
@@ -51,7 +51,7 @@ func SendFilesToStores(files []*multipart.FileHeader, isAsync bool, userName str
}
upToken := putPolicy.UploadToken(api.QiniuAPI)
cfg := &storage.Config{}
task := tasksch.RunManagedTask("SendFilesToStores", false, nil, 0, 1, userName, func(batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
task := tasksch.RunManagedParallelTask("SendFilesToStores", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
fileInfo := batchItemList[0].(*tUploadFileInfo)
fileHeader := fileInfo.FileHeader
storeID := fileInfo.StoreID
@@ -83,11 +83,9 @@ func SendFilesToStores(files []*multipart.FileHeader, isAsync bool, userName str
return retVal, err
}, fileList)
if isAsync {
return task.ID, nil
hint = task.ID
if !isAsync {
_, err = task.GetResult(0)
}
if _, err = task.GetResult(0); err == nil {
return "Done", nil
}
return "", err
return task.ID, err
}