From 9a2e47b23a6d460acfce9b1b77e6f9fb06ca1b75 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 17 May 2020 00:31:38 +0100 Subject: Refactor Cron and merge dashboard tasks (#10745) * Refactor Cron and merge dashboard tasks * Merge Cron and Dashboard tasks * Make every cron task report a system notice on completion * Refactor the creation of these tasks * Ensure that execution counts of tasks is correct * Allow cron tasks to be started from the cron page * golangci-lint fixes * Enforce that only one task with the same name can be registered Signed-off-by: Andrew Thornton * fix name check Signed-off-by: Andrew Thornton * as per @guillep2k * as per @lafriks Signed-off-by: Andrew Thornton * Add git.CommandContext variants Signed-off-by: Andrew Thornton Co-authored-by: Lauris BH Co-authored-by: Lunny Xiao Co-authored-by: techknowlogick --- modules/migrations/update.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'modules/migrations') diff --git a/modules/migrations/update.go b/modules/migrations/update.go index 3d0962657c..e7a57ceca8 100644 --- a/modules/migrations/update.go +++ b/modules/migrations/update.go @@ -13,17 +13,19 @@ import ( ) // UpdateMigrationPosterID updates all migrated repositories' issues and comments posterID -func UpdateMigrationPosterID(ctx context.Context) { +func UpdateMigrationPosterID(ctx context.Context) error { for _, gitService := range structs.SupportedFullGitService { select { case <-ctx.Done(): - log.Warn("UpdateMigrationPosterID aborted due to shutdown before %s", gitService.Name()) + log.Warn("UpdateMigrationPosterID aborted before %s", gitService.Name()) + return models.ErrCancelledf("during UpdateMigrationPosterID before %s", gitService.Name()) default: } if err := updateMigrationPosterIDByGitService(ctx, gitService); err != nil { log.Error("updateMigrationPosterIDByGitService failed: %v", err) } } + return nil } func updateMigrationPosterIDByGitService(ctx context.Context, tp structs.GitServiceType) error { @@ -37,7 +39,7 @@ func updateMigrationPosterIDByGitService(ctx context.Context, tp structs.GitServ for { select { case <-ctx.Done(): - log.Warn("UpdateMigrationPosterIDByGitService(%s) aborted due to shutdown", tp.Name()) + log.Warn("UpdateMigrationPosterIDByGitService(%s) cancelled", tp.Name()) return nil default: } @@ -54,7 +56,7 @@ func updateMigrationPosterIDByGitService(ctx context.Context, tp structs.GitServ for _, user := range users { select { case <-ctx.Done(): - log.Warn("UpdateMigrationPosterIDByGitService(%s) aborted due to shutdown", tp.Name()) + log.Warn("UpdateMigrationPosterIDByGitService(%s) cancelled", tp.Name()) return nil default: } -- cgit v1.2.3