Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repo Default: use Global Default #1

Closed
wants to merge 2 commits into from
Closed

Repo Default: use Global Default #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f0e137
Repo Default: use Global Default
6543 Sep 23, 2020
f6ff707
Update modules/repository/prune_hook_task.go
6543 Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/migrations/v153.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func addHookTaskPurge(x *xorm.Engine) error {
type Repository struct {
ID int64 `xorm:"pk autoincr"`
IsHookTaskPurgeEnabled bool `xorm:"NOT NULL DEFAULT true"`
NumberWebhookDeliveriesToKeep int64 `xorm:"NOT NULL DEFAULT 10"`
NumberWebhookDeliveriesToKeep int64 `xorm:"NOT NULL DEFAULT -1"`
}

if err := x.Sync2(new(Repository)); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion models/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ type Repository struct {
IsFsckEnabled bool `xorm:"NOT NULL DEFAULT true"`
CloseIssuesViaCommitInAnyBranch bool `xorm:"NOT NULL DEFAULT false"`
IsHookTaskPurgeEnabled bool `xorm:"NOT NULL DEFAULT true"`
NumberWebhookDeliveriesToKeep int64 `xorm:"NOT NULL DEFAULT 10"`
NumberWebhookDeliveriesToKeep int64 `xorm:"NOT NULL DEFAULT -1"`
Topics []string `xorm:"TEXT JSON"`

TrustModel TrustModelType
Expand Down
1 change: 0 additions & 1 deletion modules/repository/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (_ *m
IsFsckEnabled: !opts.IsMirror,
CloseIssuesViaCommitInAnyBranch: setting.Repository.DefaultCloseIssuesViaCommitsInAnyBranch,
IsHookTaskPurgeEnabled: setting.Repository.DefaultIsHookTaskPurgeEnabled,
NumberWebhookDeliveriesToKeep: setting.Repository.DefaultNumberWebhookDeliveriesToKeep,
Status: opts.Status,
IsEmpty: !opts.AutoInit,
TrustModel: opts.TrustModel,
Expand Down
6 changes: 5 additions & 1 deletion modules/repository/prune_hook_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

"xorm.io/builder"
)
Expand All @@ -21,14 +22,17 @@ func PruneHookTaskTable(ctx context.Context) error {
if err := models.Iterate(
models.DefaultDBContext(),
new(models.Repository),
builder.Expr("id>0 AND is_hook_task_purge_enabled=?", true),
builder.Gt{"ID": 0}.And(builder.Eq{"is_hook_task_purge_enabled": true}),
func(idx int, bean interface{}) error {
select {
case <-ctx.Done():
return fmt.Errorf("Aborted due to shutdown")
default:
}
repo := bean.(*models.Repository)
if repo.NumberWebhookDeliveriesToKeep < 0 {
repo.NumberWebhookDeliveriesToKeep = setting.Repository.DefaultNumberWebhookDeliveriesToKeep
}
repoPath := repo.RepoPath()
log.Trace("Running prune hook_task table on repository %s", repoPath)
if err := models.DeleteDeliveredHookTasks(repo.ID, repo.NumberWebhookDeliveriesToKeep); err != nil {
Expand Down