mirror of https://github.com/go-gitea/gitea
Fix schedule tasks bugs (#28691)
Fix #28157 This PR fix the possible bugs about actions schedule. ## The Changes - Move `UpdateRepositoryUnit` and `SetRepoDefaultBranch` from models to service layer - Remove schedules plan from database and cancel waiting & running schedules tasks in this repository when actions unit has been disabled or global disabled. - Remove schedules plan from database and cancel waiting & running schedules tasks in this repository when default branch changed.pull/28546/head^2
parent
6c6823935c
commit
97292da960
@ -0,0 +1,47 @@ |
|||||||
|
// Copyright 2023 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package repository |
||||||
|
|
||||||
|
import ( |
||||||
|
"context" |
||||||
|
"slices" |
||||||
|
|
||||||
|
actions_model "code.gitea.io/gitea/models/actions" |
||||||
|
"code.gitea.io/gitea/models/db" |
||||||
|
repo_model "code.gitea.io/gitea/models/repo" |
||||||
|
"code.gitea.io/gitea/models/unit" |
||||||
|
"code.gitea.io/gitea/modules/log" |
||||||
|
) |
||||||
|
|
||||||
|
// UpdateRepositoryUnits updates a repository's units
|
||||||
|
func UpdateRepositoryUnits(ctx context.Context, repo *repo_model.Repository, units []repo_model.RepoUnit, deleteUnitTypes []unit.Type) (err error) { |
||||||
|
ctx, committer, err := db.TxContext(ctx) |
||||||
|
if err != nil { |
||||||
|
return err |
||||||
|
} |
||||||
|
defer committer.Close() |
||||||
|
|
||||||
|
// Delete existing settings of units before adding again
|
||||||
|
for _, u := range units { |
||||||
|
deleteUnitTypes = append(deleteUnitTypes, u.Type) |
||||||
|
} |
||||||
|
|
||||||
|
if slices.Contains(deleteUnitTypes, unit.TypeActions) { |
||||||
|
if err := actions_model.CleanRepoScheduleTasks(ctx, repo); err != nil { |
||||||
|
log.Error("CleanRepoScheduleTasks: %v", err) |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
if _, err = db.GetEngine(ctx).Where("repo_id = ?", repo.ID).In("type", deleteUnitTypes).Delete(new(repo_model.RepoUnit)); err != nil { |
||||||
|
return err |
||||||
|
} |
||||||
|
|
||||||
|
if len(units) > 0 { |
||||||
|
if err = db.Insert(ctx, units); err != nil { |
||||||
|
return err |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
return committer.Commit() |
||||||
|
} |
Loading…
Reference in new issue