Address PR feedback

mtojek · mtojek · commit 4545cb6a1017 · 2023-08-02T12:55:05.000+02:00
diff --git a/coderd/dormancy/dormantusersjob.go b/coderd/dormancy/dormantusersjob.go
@@ -37,20 +37,20 @@ func CheckInactiveUsersWithOptions(ctx context.Context, logger slog.Logger, db d
 			case <-ticker.C:
 			}
 
+			startTime := time.Now()
 			lastSeenAfter := database.Now().Add(-dormancyPeriod)
 			logger.Debug(ctx, "check inactive user accounts", slog.F("dormancy_period", dormancyPeriod), slog.F("last_seen_after", lastSeenAfter))
 
 			updatedUsers, err := db.UpdateInactiveUsersToDormant(ctx, lastSeenAfter)
 			if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
 				logger.Error(ctx, "can't mark inactive users as dormant", slog.Error(err))
-				goto done
+				continue
 			}
 
 			for _, u := range updatedUsers {
 				logger.Info(ctx, "account has been marked as dormant", slog.F("email", u.Email), slog.F("last_seen_at", u.LastSeenAt))
 			}
-		done:
-			logger.Debug(ctx, "checking user accounts is done", slog.F("num_dormant_accounts", len(updatedUsers)))
+			logger.Debug(ctx, "checking user accounts is done", slog.F("num_dormant_accounts", len(updatedUsers)), slog.F("execution_time", time.Since(startTime)))
 		}
 	}()
 

Original file line number	Diff line number	Diff line change
`@@ -37,20 +37,20 @@ func CheckInactiveUsersWithOptions(ctx context.Context, logger slog.Logger, db d`
`37`	`37`	`case <-ticker.C:`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ startTime := time.Now()`
`40`	`41`	`lastSeenAfter := database.Now().Add(-dormancyPeriod)`
`41`	`42`	`logger.Debug(ctx, "check inactive user accounts", slog.F("dormancy_period", dormancyPeriod), slog.F("last_seen_after", lastSeenAfter))`
`42`	`43`
`43`	`44`	`updatedUsers, err := db.UpdateInactiveUsersToDormant(ctx, lastSeenAfter)`
`44`	`45`	`if err != nil && !xerrors.Is(err, sql.ErrNoRows) {`
`45`	`46`	`logger.Error(ctx, "can't mark inactive users as dormant", slog.Error(err))`
`46`		`- goto done`
	`47`	`+ continue`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`for _, u := range updatedUsers {`
`50`	`51`	`logger.Info(ctx, "account has been marked as dormant", slog.F("email", u.Email), slog.F("last_seen_at", u.LastSeenAt))`
`51`	`52`	`}`
`52`		`- done:`
`53`		`- logger.Debug(ctx, "checking user accounts is done", slog.F("num_dormant_accounts", len(updatedUsers)))`
	`53`	`+ logger.Debug(ctx, "checking user accounts is done", slog.F("num_dormant_accounts", len(updatedUsers)), slog.F("execution_time", time.Since(startTime)))`
`54`	`54`	`}`
`55`	`55`	`}()`
`56`	`56`