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 --- services/mirror/mirror.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'services') diff --git a/services/mirror/mirror.go b/services/mirror/mirror.go index 82d8fc59b2..165e7cd35b 100644 --- a/services/mirror/mirror.go +++ b/services/mirror/mirror.go @@ -296,7 +296,7 @@ func Password(m *models.Mirror) string { } // Update checks and updates mirror repositories. -func Update(ctx context.Context) { +func Update(ctx context.Context) error { log.Trace("Doing: Update") if err := models.MirrorsIterate(func(idx int, bean interface{}) error { m := bean.(*models.Mirror) @@ -306,14 +306,17 @@ func Update(ctx context.Context) { } select { case <-ctx.Done(): - return fmt.Errorf("Aborted due to shutdown") + return fmt.Errorf("Aborted") default: mirrorQueue.Add(m.RepoID) return nil } }); err != nil { - log.Error("Update: %v", err) + log.Trace("Update: %v", err) + return err } + log.Trace("Finished: Update") + return nil } // SyncMirrors checks and syncs mirrors. -- cgit v1.2.3