fix: get model issue

crawlab-team · Jun 9, 2024 · ea01556 · ea01556
1 parent 54863d2
commit ea01556
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/grpc/server/task_server.go b/grpc/server/task_server.go
@@ -112,12 +112,20 @@ func (svr TaskServer) Fetch(ctx context.Context, request *grpc.Request) (respons
 
 func (svr TaskServer) SendNotification(ctx context.Context, request *grpc.Request) (response *grpc.Response, err error) {
 	svc := notification.GetService()
-	var e bson.M
-	if err := json.Unmarshal(request.Data, &e); err != nil {
+	var t = new(models.Task)
+	if err := json.Unmarshal(request.Data, t); err != nil {
+		return nil, trace.TraceError(err)
+	}
+	t, err = svr.modelSvc.GetTaskById(t.Id)
+	if err != nil {
 		return nil, trace.TraceError(err)
 	}
-	var t models.Task
-	if err := json.Unmarshal(request.Data, &t); err != nil {
+	td, err := json.Marshal(t)
+	if err != nil {
+		return nil, trace.TraceError(err)
+	}
+	var e bson.M
+	if err := json.Unmarshal(td, &e); err != nil {
 		return nil, trace.TraceError(err)
 	}
 	ts, err := svr.modelSvc.GetTaskStatById(t.Id)

diff --git a/task/handler/runner.go b/task/handler/runner.go
@@ -115,9 +115,6 @@ func (r *Runner) Run() (err error) {
 	// configure logging
 	r.configureLogging()
 
-	// send notification
-	r.sendNotification()
-
 	// start process
 	if err := r.cmd.Start(); err != nil {
 		return r.updateTask(constants.TaskStatusError, err)
@@ -487,7 +484,7 @@ func (r *Runner) updateTask(status string, e error) (err error) {
 		}
 
 		// send notification
-		r.sendNotification()
+		go r.sendNotification()
 
 		// update stats
 		go func() {