gitea/act_runner
3
0
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2025-06-12 17:47:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore(runner): refactor register flow

Browse Source 
Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>
This commit is contained in:
Bo-Yi.Wu
2022-10-02 12:33:17 +08:00
committed by Jason Song
parent 7486d2ab91
commit 3a1503138b
8 changed files with 165 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
poller/poller.go
View File

@ -2,12 +2,16 @@ package poller
import (
"context"
"encoding/json"
"errors"
"os"
"time"
"gitea.com/gitea/act_runner/client"
"gitea.com/gitea/act_runner/config"
runnerv1 "gitea.com/gitea/proto-go/runner/v1"
"github.com/appleboy/com/file"
"github.com/bufbuild/connect-go"
log "github.com/sirupsen/logrus"
)
@ -31,18 +35,50 @@ type Poller struct {
routineGroup *routineGroup
}
func (p *Poller) Poll(ctx context.Context, n int) error {
type runner struct {
id int64
uuid string
name string
token string
}
func (p *Poller) Register(ctx context.Context, cfg config.Runner) error {
// check .runner config exist
if file.IsFile(".runner") {
return nil
}
// register new runner.
_, err := p.Client.Register(ctx, connect.NewRequest(&runnerv1.RegisterRequest{
Os: p.Filter.OS,
Arch: p.Filter.Arch,
Capacity: int64(p.Filter.Capacity),
resp, err := p.Client.Register(ctx, connect.NewRequest(&runnerv1.RegisterRequest{
Os: p.Filter.OS,
Arch: p.Filter.Arch,
Labels: p.Filter.Labels,
Name: cfg.Name,
Token: cfg.Token,
}))
if err != nil {
log.WithError(err).Error("poller: cannot register new runner")
return err
}
data := &runner{
id: resp.Msg.Runner.Id,
uuid: resp.Msg.Runner.Uuid,
name: resp.Msg.Runner.Name,
token: resp.Msg.Runner.Token,
}
file, err := json.MarshalIndent(data, "", " ")
if err != nil {
log.WithError(err).Error("poller: cannot marshal the json input")
return err
}
// store runner config in .runner file
return os.WriteFile(".runner", file, 0o644)
}
func (p *Poller) Poll(ctx context.Context, n int) error {
for i := 0; i < n; i++ {
func(i int) {
p.routineGroup.Run(func() {
@ -79,10 +115,8 @@ func (p *Poller) poll(ctx context.Context, thread int) error {
// request a new build stage for execution from the central
// build server.
resp, err := p.Client.FetchTask(ctx, connect.NewRequest(&runnerv1.FetchTaskRequest{
Kind: p.Filter.Kind,
Os: p.Filter.OS,
Arch: p.Filter.Arch,
Type: p.Filter.Type,
}))
if err == context.Canceled || err == context.DeadlineExceeded {
l.WithError(err).Trace("poller: no stage returned")