From 36bfaf74f7a02d2b11a0a5f71a70bf4c7987db97 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 16 Mar 2020 22:50:23 +0000 Subject: [PATCH] golangci-lint fixes --- modules/cron/cron.go | 10 ---------- modules/cron/tasks.go | 12 +++++++++--- routers/admin/admin.go | 16 ---------------- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/modules/cron/cron.go b/modules/cron/cron.go index 1a220d33c..857f95145 100644 --- a/modules/cron/cron.go +++ b/modules/cron/cron.go @@ -15,16 +15,6 @@ import ( "github.com/gogs/cron" ) -const ( - mirrorUpdate = "mirror_update" - gitFsck = "git_fsck" - checkRepos = "check_repos" - archiveCleanup = "archive_cleanup" - syncExternalUsers = "sync_external_users" - deletedBranchesCleanup = "deleted_branches_cleanup" - updateMigrationPosterID = "update_migration_post_id" -) - var c = cron.New() // Prevent duplicate running tasks. diff --git a/modules/cron/tasks.go b/modules/cron/tasks.go index 277f602b7..f0a60e692 100644 --- a/modules/cron/tasks.go +++ b/modules/cron/tasks.go @@ -88,13 +88,19 @@ func (t *Task) RunWithUser(doer *models.User, config Config) { if err := t.fun(ctx, doer, config); err != nil { if models.IsErrCancelled(err) { message := err.(models.ErrCancelled).Message - models.CreateNotice(models.NoticeTask, config.FormatMessage(t.Name, "aborted", doer, message)) + if err := models.CreateNotice(models.NoticeTask, config.FormatMessage(t.Name, "aborted", doer, message)); err != nil { + log.Error("CreateNotice: %v", err) + } return } - models.CreateNotice(models.NoticeTask, config.FormatMessage(t.Name, "error", doer, err)) + if err := models.CreateNotice(models.NoticeTask, config.FormatMessage(t.Name, "error", doer, err)); err != nil { + log.Error("CreateNotice: %v", err) + } return } - models.CreateNotice(models.NoticeTask, config.FormatMessage(t.Name, "finished", doer)) + if err := models.CreateNotice(models.NoticeTask, config.FormatMessage(t.Name, "finished", doer)); err != nil { + log.Error("CreateNotice: %v", err) + } }) } diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 9b706b6c1..7595f4929 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -122,22 +122,6 @@ func updateSystemStatus() { sysStatus.NumGC = m.NumGC } -// Operation Operation types. -type Operation int - -const ( - cleanInactivateUser Operation = iota + 1 - cleanRepoArchives - cleanMissingRepos - gitGCRepos - syncSSHAuthorizedKey - syncRepositoryUpdateHook - reinitMissingRepository - syncExternalUsers - gitFsck - deleteGeneratedRepositoryAvatars -) - // Dashboard show admin panel dashboard func Dashboard(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.dashboard")