feat(runner): update runner last_online and status when FetchTask

This commit is contained in:
fuxiaohei 2022-10-11 20:28:36 +08:00 committed by Jason Song
parent 32a5797608
commit 1a78fd3494

View File

@ -18,6 +18,7 @@ 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"
@ -128,6 +129,8 @@ 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,
@ -135,6 +138,21 @@ 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)