add refresh token cleanup log message

myrunes · Mar 10, 2021 · 4d32d19 · 4d32d19
1 parent 04fd723
commit 4d32d19
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -91,8 +91,11 @@ func refetch(a *assets.AvatarHandler) {
 }
 
 func cleanupExpiredRefreshTokens(db database.Middleware) {
-	if err := db.CleanupExpiredTokens(); err != nil {
+	n, err := db.CleanupExpiredTokens()
+	if err != nil {
 		logger.Error("DATABASE :: failed cleaning up expired refresh tokens: %s", err.Error())
+	} else {
+		logger.Info("AUTH :: cleaned %d expired refresh tokens", n)
 	}
 }
 
@@ -199,7 +202,7 @@ func main() {
 	}()
 	logger.Info("WEBSERVER :: started")
 
-	lct := lifecycletimer.New(24 * time.Hour).
+	lct := lifecycletimer.New(24 * time.Second).
 		Handle(func() { refetch(avatarAssetsHandler) }).
 		Handle(func() { cleanupExpiredRefreshTokens(db) }).
 		Start()

diff --git a/internal/database/middleware.go b/internal/database/middleware.go
@@ -97,7 +97,7 @@ type Middleware interface {
 	RemoveRefreshToken(id snowflake.ID) error
 	// CleanupExpiredTokens removes all expired tokens
 	// from the database.
-	CleanupExpiredTokens() error
+	CleanupExpiredTokens() (int, error)
 
 	// SetAPIToken sets the passed API token
 	// to the user defined in the APIToken

diff --git a/internal/database/mongodb.go b/internal/database/mongodb.go
@@ -349,18 +349,21 @@ func (m *MongoDB) RemoveRefreshToken(id snowflake.ID) error {
 	return err
 }
 
-func (m *MongoDB) CleanupExpiredTokens() error {
+func (m *MongoDB) CleanupExpiredTokens() (n int, err error) {
 	ctx, cancel := ctxTimeout(10 * time.Second)
 	defer cancel()
 
 	now := time.Now()
-	_, err := m.collections.refreshtokens.DeleteMany(ctx, bson.M{
+	res, err := m.collections.refreshtokens.DeleteMany(ctx, bson.M{
 		"deadline": bson.M{
 			"$lte": now,
 		},
 	})
+	if res != nil {
+		n = int(res.DeletedCount)
+	}
 
-	return err
+	return
 }
 
 // --- HELPERS ------------------------------------------------------------------