From 8f55af07c936218487ec94e65c6673fbddd0cdb5 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 27 Oct 2021 22:08:11 +0200 Subject: [PATCH] feat: add more debug logging when deleting users related to #1021 --- pkg/models/user_delete.go | 10 ++++++++-- pkg/user/delete.go | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkg/models/user_delete.go b/pkg/models/user_delete.go index f0f67fa131..69327baae5 100644 --- a/pkg/models/user_delete.go +++ b/pkg/models/user_delete.go @@ -54,9 +54,13 @@ func deleteUsers() { return } + log.Debugf("Found %d users scheduled for deletion", len(users)) + + now := time.Now() + for _, u := range users { - if u.DeletionScheduledAt.Before(time.Now()) { - log.Debugf("User %d is not yet scheduled for deletion.", u.ID) + if u.DeletionScheduledAt.Before(now) { + log.Debugf("User %d is not yet scheduled for deletion. Scheduled at %s, now is %s", u.ID, u.DeletionScheduledAt, now) continue } @@ -73,6 +77,8 @@ func deleteUsers() { return } + log.Debugf("Deleted user %d", u.ID) + err = s.Commit() if err != nil { log.Errorf("Could not commit transaction: %s", err) diff --git a/pkg/user/delete.go b/pkg/user/delete.go index c842cec20d..b07c3747f2 100644 --- a/pkg/user/delete.go +++ b/pkg/user/delete.go @@ -49,7 +49,7 @@ func notifyUsersScheduledForDeletion() { return } - log.Debugf("Found %d users scheduled for deletion", len(users)) + log.Debugf("Found %d users scheduled for deletion to notify", len(users)) for _, user := range users { if time.Since(user.DeletionLastReminderSent) < time.Hour*24 { @@ -64,6 +64,8 @@ func notifyUsersScheduledForDeletion() { number = 3 } + log.Debugf("Notifying user %d of the deletion of their account...", user.ID) + err = notifications.Notify(user, &AccountDeletionNotification{ User: user, NotificationNumber: number,