git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-22 17:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: fix test cases

Browse Source
This commit is contained in:
Marvin Zhang
2024-11-22 11:32:20 +08:00
parent c558ef4a9d
commit 739d796d1b
4 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/task/handler/runner.go
View File

@@ -6,6 +6,8 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/crawlab-team/crawlab/core/fs"
"github.com/hashicorp/go-multierror"
"io"
"net/http"
"os"
@@ -20,7 +22,6 @@ import (
"github.com/apex/log"
"github.com/crawlab-team/crawlab/core/constants"
"github.com/crawlab-team/crawlab/core/entity"
"github.com/crawlab-team/crawlab/core/fs"
client2 "github.com/crawlab-team/crawlab/core/grpc/client"
"github.com/crawlab-team/crawlab/core/interfaces"
"github.com/crawlab-team/crawlab/core/models/client"
@@ -924,21 +925,24 @@ func newTaskRunner(id primitive.ObjectID, svc *Service) (r *Runner, err error) {
logBatchSize: 20,
}
// multi error
var errs multierror.Error
// task
r.t, err = svc.GetTaskById(id)
if err != nil {
return r, err
errs.Errors = append(errs.Errors, err)
} else {
// spider
r.s, err = svc.GetSpiderById(r.t.SpiderId)
if err != nil {
errs.Errors = append(errs.Errors, err)
} else {
// task fs service
r.fsSvc = fs.NewFsService(filepath.Join(utils.GetWorkspace(), r.s.Id.Hex()))
}
}
// spider
r.s, err = svc.GetSpiderById(r.t.SpiderId)
if err != nil {
return r, err
}
// task fs service
r.fsSvc = fs.NewFsService(filepath.Join(utils.GetWorkspace(), r.s.Id.Hex()))
// grpc client
r.c = client2.GetGrpcClient()
@@ -949,8 +953,8 @@ func newTaskRunner(id primitive.ObjectID, svc *Service) (r *Runner, err error) {
// initialize task runner
if err := r.Init(); err != nil {
log.Errorf("error initializing task runner: %v", err)
return r, err
errs.Errors = append(errs.Errors, err)
}
return r, nil
return r, errs.ErrorOrNil()
}