diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-10 13:13:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 13:13:16 +0800 |
| commit | 33fca2b537d36cf998dd27425b2bb8ed5b0965f3 (patch) | |
| tree | 817f392502e1c176a5cd7e80290520cb940a8416 /modules/cron | |
| parent | edbaa5d3f05b5ca397524587ba9db15edd61bc29 (diff) | |
| download | gitea-33fca2b537d36cf998dd27425b2bb8ed5b0965f3.tar.gz gitea-33fca2b537d36cf998dd27425b2bb8ed5b0965f3.zip | |
Move webhook into models/webhook/ (#17579)
Diffstat (limited to 'modules/cron')
| -rw-r--r-- | modules/cron/tasks.go | 5 | ||||
| -rw-r--r-- | modules/cron/tasks_basic.go | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/cron/tasks.go b/modules/cron/tasks.go index 6f3a96fd3f..56c363e0b8 100644 --- a/modules/cron/tasks.go +++ b/modules/cron/tasks.go @@ -11,6 +11,7 @@ import ( "sync" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" @@ -86,8 +87,8 @@ func (t *Task) RunWithUser(doer *models.User, config Config) { pid := pm.Add(config.FormatMessage(t.Name, "process", doer), cancel) defer pm.Remove(pid) if err := t.fun(ctx, doer, config); err != nil { - if models.IsErrCancelled(err) { - message := err.(models.ErrCancelled).Message + if db.IsErrCancelled(err) { + message := err.(db.ErrCancelled).Message if err := models.CreateNotice(models.NoticeTask, config.FormatMessage(t.Name, "aborted", doer, message)); err != nil { log.Error("CreateNotice: %v", err) } diff --git a/modules/cron/tasks_basic.go b/modules/cron/tasks_basic.go index 6c61d628c5..a42c031b36 100644 --- a/modules/cron/tasks_basic.go +++ b/modules/cron/tasks_basic.go @@ -9,6 +9,7 @@ import ( "time" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/migrations" repository_service "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" @@ -122,7 +123,7 @@ func registerCleanupHookTaskTable() { NumberToKeep: 10, }, func(ctx context.Context, _ *models.User, config Config) error { realConfig := config.(*CleanupHookTaskConfig) - return models.CleanupHookTaskTable(ctx, models.ToHookTaskCleanupType(realConfig.CleanupType), realConfig.OlderThan, realConfig.NumberToKeep) + return webhook.CleanupHookTaskTable(ctx, webhook.ToHookTaskCleanupType(realConfig.CleanupType), realConfig.OlderThan, realConfig.NumberToKeep) }) } |