tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 04:45:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(bots): move runner status update function to context

Browse Source
This commit is contained in:
fuxiaohei 2022-10-11 20:42:35 +08:00 committed by Jason Song
parent dff0d4b907
commit 9648482ed6
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
routers/api/bots/runner/runner.go
View File

@ -18,7 +18,6 @@ import (
"code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
runnerv1 "gitea.com/gitea/proto-go/runner/v1" runnerv1 "gitea.com/gitea/proto-go/runner/v1"
"gitea.com/gitea/proto-go/runner/v1/runnerv1connect" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect"
@ -129,8 +128,6 @@ func (s *Service) Register(
return res, nil return res, nil
} }
const runnerOnlineTimeDeltaSecs = 30
// FetchTask assigns a task to the runner // FetchTask assigns a task to the runner
func (s *Service) FetchTask( func (s *Service) FetchTask(
ctx context.Context, ctx context.Context,
@ -138,21 +135,6 @@ func (s *Service) FetchTask(
) (*connect.Response[runnerv1.FetchTaskResponse], error) { ) (*connect.Response[runnerv1.FetchTaskResponse], error) {
runner := GetRunner(ctx) runner := GetRunner(ctx)
// update runner online status
if runner.Status == runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE {
runner.LastOnline = timeutil.TimeStampNow()
runner.Status = runnerv1.RunnerStatus_RUNNER_STATUS_ACTIVE
if err := bots_model.UpdateRunner(ctx, runner, "last_online", "status"); err != nil {
log.Error("can't update runner status: %v", err)
}
}
if timeutil.TimeStampNow()-runner.LastOnline >= runnerOnlineTimeDeltaSecs {
runner.LastOnline = timeutil.TimeStampNow()
if err := bots_model.UpdateRunner(ctx, runner, "last_online"); err != nil {
log.Error("can't update runner last_online: %v", err)
}
}
var task *runnerv1.Task var task *runnerv1.Task
if t, ok, err := s.pickTask(ctx, runner); err != nil { if t, ok, err := s.pickTask(ctx, runner); err != nil {
return nil, status.Errorf(codes.Internal, "pick task: %v", err) return nil, status.Errorf(codes.Internal, "pick task: %v", err)

21
routers/api/bots/runner/unary.go
View File

@ -9,12 +9,17 @@ import (
"strings" "strings"
bots_model "code.gitea.io/gitea/models/bots" bots_model "code.gitea.io/gitea/models/bots"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
runnerv1 "gitea.com/gitea/proto-go/runner/v1"
"github.com/bufbuild/connect-go" "github.com/bufbuild/connect-go"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
) )
const runnerOnlineTimeDeltaSecs = 30
var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc { var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc {
return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) { return func(ctx context.Context, request connect.AnyRequest) (connect.AnyResponse, error) {
if methodName(request) == "Register" { if methodName(request) == "Register" {
@ -28,6 +33,22 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar
} }
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
// update runner online status
if runner.Status == runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE {
runner.LastOnline = timeutil.TimeStampNow()
runner.Status = runnerv1.RunnerStatus_RUNNER_STATUS_ACTIVE
if err := bots_model.UpdateRunner(ctx, runner, "last_online", "status"); err != nil {
log.Error("can't update runner status: %v", err)
}
}
if timeutil.TimeStampNow()-runner.LastOnline >= runnerOnlineTimeDeltaSecs {
runner.LastOnline = timeutil.TimeStampNow()
if err := bots_model.UpdateRunner(ctx, runner, "last_online"); err != nil {
log.Error("can't update runner last_online: %v", err)
}
}
ctx = context.WithValue(ctx, runnerCtxKey{}, runner) ctx = context.WithValue(ctx, runnerCtxKey{}, runner)
return unaryFunc(ctx, request) return unaryFunc(ctx, request)
} }