Skip to content

N
nodemanager
Commit f6e6c29b authored by vicotor's avatar vicotor
Browse files
Options

update

parent 53542c44
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 26 deletions
server/workerManager.go
View file @ f6e6c29b
...@@ -304,14 +304,13 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error { ...@@ -304,14 +304,13 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
if result.IsSuccessed == false { if result.IsSuccessed == false {
taskResponse := &odysseus.TaskResponse{ taskResponse := &odysseus.TaskResponse{
TaskUuid: task.TaskUuid, TaskUuid: task.TaskUuid,
TaskResultHeader: result.TaskResultHeader, TaskResultHeader: result.TaskResultHeader,
TaskResultBody: result.TaskResultBody, TaskResultBody: result.TaskResultBody,
TaskUid: task.TaskUid, TaskUid: task.TaskUid,
TaskFee: task.TaskFee, TaskFee: task.TaskFee,
TaskIsSucceed: false, TaskIsSucceed: false,
TaskError: "worker failed", TaskError: "worker failed",
TaskExecuteDuration: result.TaskExecuteDuration,
} }
receipt := wm.makeReceipt(worker, task, result, errors.New("worker failed")) receipt := wm.makeReceipt(worker, task, result, errors.New("worker failed"))
wm.node.PostResult(receipt) wm.node.PostResult(receipt)
...@@ -375,14 +374,13 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error { ...@@ -375,14 +374,13 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
worker.recentTask.Remove(result.TaskUuid) worker.recentTask.Remove(result.TaskUuid)
} }
taskResponse := &odysseus.TaskResponse{ taskResponse := &odysseus.TaskResponse{
TaskUuid: task.TaskUuid, TaskUuid: task.TaskUuid,
TaskResultHeader: result.TaskResultHeader, TaskResultHeader: result.TaskResultHeader,
TaskResultBody: result.TaskResultBody, TaskResultBody: result.TaskResultBody,
TaskUid: task.TaskUid, TaskUid: task.TaskUid,
TaskFee: task.TaskFee, TaskFee: task.TaskFee,
TaskIsSucceed: true, TaskIsSucceed: true,
TaskError: "", TaskError: "",
TaskExecuteDuration: result.TaskExecuteDuration,
} }
go wm.doCallback(task.TaskCallback, taskResponse) go wm.doCallback(task.TaskCallback, taskResponse)
...@@ -513,16 +511,17 @@ func (wm *WorkerManager) Payment(task *odysseus.TaskContent) error { ...@@ -513,16 +511,17 @@ func (wm *WorkerManager) Payment(task *odysseus.TaskContent) error {
func (wm *WorkerManager) makeReceipt(worker *Worker, task *odysseus.TaskContent, result *omanager.SubmitTaskResult, err error) *odysseus.TaskReceipt { func (wm *WorkerManager) makeReceipt(worker *Worker, task *odysseus.TaskContent, result *omanager.SubmitTaskResult, err error) *odysseus.TaskReceipt {
now := uint64(time.Now().UnixNano()) now := uint64(time.Now().UnixNano())
receipt := &odysseus.TaskReceipt{ receipt := &odysseus.TaskReceipt{
TaskUuid: task.TaskUuid, TaskUuid: task.TaskUuid,
TaskTimestamp: task.TaskTimestamp, TaskTimestamp: task.TaskTimestamp,
TaskId: task.TaskId, TaskId: task.TaskId,
TaskUid: task.TaskUid, TaskUid: task.TaskUid,
TaskWorkload: task.TaskWorkload, TaskWorkload: task.TaskWorkload,
TaskDuration: int64(now-task.TaskTimestamp) / 1000, TaskDuration: int64(now-task.TaskTimestamp) / 1000,
TaskFee: 0, TaskFee: 0,
TaskOutLen: int64(len(result.TaskResultBody)), TaskOutLen: int64(len(result.TaskResultBody)),
TaskProfitAccount: worker.ProfitAccount().Hex(), TaskProfitAccount: worker.ProfitAccount().Hex(),
TaskWorkerAccount: worker.WorkerAccount().Hex(), TaskWorkerAccount: worker.WorkerAccount().Hex(),
TaskExecuteDuration: result.TaskExecuteDuration,
} }
if result.IsSuccessed { if result.IsSuccessed {
fee, _ := strconv.ParseInt(task.TaskFee, 10, 64) fee, _ := strconv.ParseInt(task.TaskFee, 10, 64)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment