diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-09-27 13:37:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 05:37:48 +0000 |
| commit | 3b2da7e4aeed8e2d070b9ce5c66282b16eeb87f1 (patch) | |
| tree | 577f6a18be7953ca684444c90d9c0873f805fc14 /routers/web/shared | |
| parent | ee27b94b2c84f6604cb0428d6c2a5611161aac14 (diff) | |
| download | gitea-3b2da7e4aeed8e2d070b9ce5c66282b16eeb87f1.tar.gz gitea-3b2da7e4aeed8e2d070b9ce5c66282b16eeb87f1.zip | |
Redefine the meaning of column is_active to make Actions Registration Token generation easier (#27143)
Partially Fix #25041
This PR redefined the meaning of column `is_active` in table
`action_runner_token`.
Before this PR, `is_active` means whether it has been used by any
runner. If it's true, other runner cannot use it to register again.
In this PR, `is_active` means whether it's validated to be used to
register runner. And if it's true, then it can be used to register
runners until it become false. When creating a new `is_active` register
token, any previous tokens will be set `is_active` to false.
Diffstat (limited to 'routers/web/shared')
| -rw-r--r-- | routers/web/shared/actions/runners.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 7ff1f3e33f..cd60e9cbee 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -35,15 +35,15 @@ func RunnersList(ctx *context.Context, opts actions_model.FindRunnerOptions) { // ownid=0,repo_id=0,means this token is used for global var token *actions_model.ActionRunnerToken - token, err = actions_model.GetUnactivatedRunnerToken(ctx, opts.OwnerID, opts.RepoID) - if errors.Is(err, util.ErrNotExist) { + token, err = actions_model.GetLastestRunnerToken(ctx, opts.OwnerID, opts.RepoID) + if errors.Is(err, util.ErrNotExist) || (token != nil && !token.IsActive) { token, err = actions_model.NewRunnerToken(ctx, opts.OwnerID, opts.RepoID) if err != nil { ctx.ServerError("CreateRunnerToken", err) return } } else if err != nil { - ctx.ServerError("GetUnactivatedRunnerToken", err) + ctx.ServerError("GetLastestRunnerToken", err) return } |