From ab11fbfda9a0ffad8a20edc32a6ae2c4716e29dc Mon Sep 17 00:00:00 2001 From: Gaius Date: Wed, 30 Oct 2024 16:18:25 +0800 Subject: [PATCH] feat: optimize error message of preheating (#3622) Signed-off-by: Gaius --- manager/middlewares/error.go | 2 +- manager/service/job.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manager/middlewares/error.go b/manager/middlewares/error.go index c4c5c8d05..a38d1fe7f 100644 --- a/manager/middlewares/error.go +++ b/manager/middlewares/error.go @@ -87,7 +87,7 @@ func Error() gin.HandlerFunc { // GORM error handler if errors.Is(err.Err, gorm.ErrRecordNotFound) { c.JSON(http.StatusNotFound, ErrorResponse{ - Message: http.StatusText(http.StatusNotFound), + Message: err.Error(), }) c.Abort() return diff --git a/manager/service/job.go b/manager/service/job.go index f68a44560..f786eaaad 100644 --- a/manager/service/job.go +++ b/manager/service/job.go @@ -186,7 +186,7 @@ func (s *service) findSchedulers(ctx context.Context, schedulerClusterIDs []uint for _, schedulerClusterID := range schedulerClusterIDs { schedulerCluster := models.SchedulerCluster{} if err := s.db.WithContext(ctx).First(&schedulerCluster, schedulerClusterID).Error; err != nil { - return nil, err + return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err) } var schedulers []models.Scheduler @@ -194,7 +194,7 @@ func (s *service) findSchedulers(ctx context.Context, schedulerClusterIDs []uint SchedulerClusterID: schedulerCluster.ID, State: models.SchedulerStateActive, }).Error; err != nil { - return nil, err + return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err) } activeSchedulers = append(activeSchedulers, schedulers...) @@ -233,7 +233,7 @@ func (s *service) findCandidateSchedulers(ctx context.Context, schedulerClusterI for _, schedulerClusterID := range schedulerClusterIDs { schedulerCluster := models.SchedulerCluster{} if err := s.db.WithContext(ctx).First(&schedulerCluster, schedulerClusterID).Error; err != nil { - return nil, err + return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err) } var schedulers []models.Scheduler @@ -241,7 +241,7 @@ func (s *service) findCandidateSchedulers(ctx context.Context, schedulerClusterI SchedulerClusterID: schedulerCluster.ID, State: models.SchedulerStateActive, }).Error; err != nil { - return nil, err + return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err) } for _, scheduler := range schedulers {