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

refactor: code cleanup

Browse Source
This commit is contained in:
Marvin Zhang
2024-10-31 12:59:58 +08:00
parent 1c67ad2889
commit 53afb0064e
97 changed files with 388 additions and 1561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/node/service/master_service.go
View File

@@ -32,7 +32,7 @@ type MasterService struct {
cfgSvc interfaces.NodeConfigService
server *server.GrpcServer
schedulerSvc *scheduler.ServiceV2
handlerSvc *handler.ServiceV2
handlerSvc *handler.Service
scheduleSvc *schedule.ServiceV2
systemSvc *system.ServiceV2
@@ -345,7 +345,7 @@ func newMasterServiceV2() (res *MasterService, err error) {
}
// handler service
svc.handlerSvc, err = handler.GetTaskHandlerServiceV2()
svc.handlerSvc, err = handler.GetTaskHandlerService()
if err != nil {
return nil, err
}

14
core/node/service/worker_service.go
View File

@@ -23,8 +23,8 @@ import (
type WorkerService struct {
// dependencies
cfgSvc interfaces.NodeConfigService
client *client.GrpcClientV2
handlerSvc *handler.ServiceV2
client *client.GrpcClient
handlerSvc *handler.Service
// settings
cfgPath string
@@ -188,20 +188,14 @@ func newWorkerService() (res *WorkerService, err error) {
heartbeatInterval: 15 * time.Second,
}
// dependency options
var clientOpts []client.Option
if svc.address != nil {
clientOpts = append(clientOpts, client.WithAddress(svc.address))
}
// node config service
svc.cfgSvc = nodeconfig.GetNodeConfigService()
// grpc client
svc.client = client.GetGrpcClientV2()
svc.client = client.GetGrpcClient()
// handler service
svc.handlerSvc, err = handler.GetTaskHandlerServiceV2()
svc.handlerSvc, err = handler.GetTaskHandlerService()
if err != nil {
return nil, err
}