feat: Wrap the error with the proper error message

Close: #3642 Signed-off-by: weichou <[email protected]>
edgexfoundry · Aug 3, 2021 · 3d5ecab · 3d5ecab
1 parent aaf2bd6
commit 3d5ecab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/internal/support/scheduler/application/interval.go b/internal/support/scheduler/application/interval.go
@@ -163,7 +163,7 @@ func LoadIntervalToSchedulerManager(dic *di.Container) errors.EdgeX {
 		}
 		validateErr := common.Validate(dto)
 		if validateErr != nil {
-			return errors.NewCommonEdgeXWrapper(validateErr)
+			return errors.NewCommonEdgeX(errors.KindContractInvalid, fmt.Sprintf("validate pre-defined Interval %s from configuration failed", dto.Name), validateErr)
 		}
 		interval := dtos.ToIntervalModel(dto)
 		_, err := dbClient.IntervalByName(interval.Name)

diff --git a/internal/support/scheduler/application/intervalaction.go b/internal/support/scheduler/application/intervalaction.go
@@ -170,7 +170,7 @@ func LoadIntervalActionToSchedulerManager(dic *di.Container) errors.EdgeX {
 		}
 		validateErr := common.Validate(dto)
 		if validateErr != nil {
-			return errors.NewCommonEdgeXWrapper(validateErr)
+			return errors.NewCommonEdgeX(errors.KindContractInvalid, fmt.Sprintf("validate pre-defined IntervalAction %s from configuration failed", dto.Name), validateErr)
 		}
 		_, err := dbClient.IntervalByName(dto.IntervalName)
 		if err != nil {

diff --git a/internal/support/scheduler/init.go b/internal/support/scheduler/init.go
@@ -59,13 +59,13 @@ func (b *Bootstrap) BootstrapHandler(ctx context.Context, wg *sync.WaitGroup, _
 
 	err := application.LoadIntervalToSchedulerManager(dic)
 	if err != nil {
-		lc.Errorf("Failed to load interval to scheduler %v", err)
+		lc.Errorf("Failed to load interval to scheduler, %v", err)
 		return false
 	}
 
 	err = application.LoadIntervalActionToSchedulerManager(dic)
 	if err != nil {
-		lc.Errorf("Failed to load interval to scheduler %v", err)
+		lc.Errorf("Failed to load intervalAction to scheduler, %v", err)
 		return false
 	}