chore: add debug log

iotexproject · Jun 21, 2024 · 3ec0b74 · 3ec0b74
1 parent 08d1ceb
commit 3ec0b74
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/pkg/modules/event/errors.go b/pkg/modules/event/errors.go
@@ -57,17 +57,31 @@ func WrapHandleError(e error, t any) error {
 	if e == nil {
 		return nil
 	}
-	return &HandleError{t, e}
+	return &HandleError{t, e, ""}
+}
+
+func WrapHandleErrorf(e error, t any, msg string, args ...any) error {
+	if e == nil {
+		return nil
+	}
+	if len(args) > 0 && msg != "" {
+		msg = fmt.Sprintf(msg, args...)
+	}
+	return &HandleError{t, e, msg}
 }
 
 type HandleError struct {
-	t any
-	e error
+	t   any
+	e   error
+	msg string
 }
 
 func (e *HandleError) Error() string {
-	return fmt.Sprintf(
+	msg := fmt.Sprintf(
 		"failed to handle event `%s`: %s",
 		reflect.Indirect(reflect.ValueOf(e.t)).Type(), e.e.Error(),
 	)
+	if e.msg != "" {
+		return msg + " " + e.msg
+	}
 }
diff --git a/pkg/modules/event/event_device_confirm.go b/pkg/modules/event/event_device_confirm.go
@@ -83,7 +83,16 @@ type message struct {
 }
 
 func (e *DeviceConfirm) Handle(ctx context.Context) (err error) {
-	defer func() { err = WrapHandleError(err, e) }()
+	projectID := must.BeTrueV(contexts.ProjectIDFromContext(ctx))
+	projectVersion := must.BeTrueV(contexts.ProjectVersionFromContext(ctx))
+
+	defer func() {
+		err = WrapHandleErrorf(
+			err, e,
+			"project_id: %d project_version: %s",
+			projectID, projectVersion,
+		)
+	}()
 
 	dev := &models.Device{ID: e.imei}
 	err = FetchByPrimary(ctx, dev)
@@ -104,8 +113,8 @@ func (e *DeviceConfirm) Handle(ctx context.Context) (err error) {
 	msg := &models.Message{
 		MessageID:      dev.Address + fmt.Sprintf("-%d", e.pkg.GetTimestamp()),
 		ClientID:       dev.Address,
-		ProjectID:      must.BeTrueV(contexts.ProjectIDFromContext(ctx)),
-		ProjectVersion: must.BeTrueV(contexts.ProjectVersionFromContext(ctx)),
+		ProjectID:      projectID,
+		ProjectVersion: projectVersion,
 		Data: must.NoErrorV(json.Marshal([]message{{
 			IMEI:        e.imei,
 			Owner:       dev.Owner,
@@ -117,7 +126,7 @@ func (e *DeviceConfirm) Handle(ctx context.Context) (err error) {
 		InternalTaskID: id,
 	}
 	task := &models.Task{
-		ProjectID:      must.BeTrueV(contexts.ProjectIDFromContext(ctx)),
+		ProjectID:      projectID,
 		InternalTaskID: id,
 		MessageIDs:     datatypes.JSON([]byte(`["` + id + `"]`)),
 		Signature:      "",