From 3c87b5cea796f4dffa765bfce681b6623ba1287c Mon Sep 17 00:00:00 2001 From: Elscrux Date: Sun, 17 Mar 2024 00:49:14 +0100 Subject: [PATCH 1/2] Return errors in Trello migration process --- pkg/modules/migration/trello/trello.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/modules/migration/trello/trello.go b/pkg/modules/migration/trello/trello.go index d19fd48b7..6e41d6f4e 100644 --- a/pkg/modules/migration/trello/trello.go +++ b/pkg/modules/migration/trello/trello.go @@ -395,7 +395,7 @@ func (m *Migration) Migrate(u *user.User) (err error) { trelloData, err := getTrelloData(m.Token) if err != nil { - return + return err } log.Debugf("[Trello Migration] Got all trello data for user %d", u.ID) @@ -403,7 +403,7 @@ func (m *Migration) Migrate(u *user.User) (err error) { fullVikunjaHierachie, err := convertTrelloDataToVikunja(trelloData, m.Token) if err != nil { - return + return err } log.Debugf("[Trello Migration] Done migrating trello data for user %d", u.ID) @@ -411,7 +411,7 @@ func (m *Migration) Migrate(u *user.User) (err error) { err = migration.InsertFromStructure(fullVikunjaHierachie, u) if err != nil { - return + return err } log.Debugf("[Trello Migration] Done inserting trello data for user %d", u.ID) -- 2.40.1 From 9b491aba5b9e388813fbd0e3fb01529005275f64 Mon Sep 17 00:00:00 2001 From: Elscrux Date: Sun, 17 Mar 2024 14:57:47 +0100 Subject: [PATCH 2/2] Add error messages --- pkg/modules/migration/handler/listeners.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/modules/migration/handler/listeners.go b/pkg/modules/migration/handler/listeners.go index fa6d1dac0..c6173e3da 100644 --- a/pkg/modules/migration/handler/listeners.go +++ b/pkg/modules/migration/handler/listeners.go @@ -68,19 +68,22 @@ func (s *MigrationListener) Handle(msg *message.Message) (err error) { err = ms.Migrate(event.User) if err != nil { - return + log.Errorf("[Migration] Failed to migrate %d from %s for user %d: %s", m.ID, event.MigratorKind, event.User.ID, err) + return err } err = migration.FinishMigration(m) if err != nil { - return + log.Errorf("[Migration] Failed to finish migration %d from %s for user %d: %s", m.ID, event.MigratorKind, event.User.ID, err) + return err } err = notifications.Notify(event.User, &MigrationDoneNotification{ MigratorName: ms.Name(), }) if err != nil { - return + log.Errorf("[Migration] Failed to notify migration %d from %s for user %d: %s", m.ID, event.MigratorKind, event.User.ID, err) + return err } log.Debugf("[Migration] Successfully done migration %d from %s for user %d", m.ID, event.MigratorKind, event.User.ID) -- 2.40.1