chore(poller): Add poller package
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
This commit is contained in:
parent
4d7ef95d40
commit
0b885c5e5f
|
@ -29,6 +29,13 @@ type (
|
||||||
Environ map[string]string `envconfig:"GITEA_RUNNER_ENVIRON"`
|
Environ map[string]string `envconfig:"GITEA_RUNNER_ENVIRON"`
|
||||||
EnvFile string `envconfig:"GITEA_RUNNER_ENV_FILE"`
|
EnvFile string `envconfig:"GITEA_RUNNER_ENV_FILE"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Platform struct {
|
||||||
|
OS string `envconfig:"GITEA_PLATFORM_OS" default:"linux"`
|
||||||
|
Arch string `envconfig:"GITEA_PLATFORM_ARCH" default:"amd64"`
|
||||||
|
Kernel string `envconfig:"GITEA_PLATFORM_KERNEL"`
|
||||||
|
Variant string `envconfig:"GITEA_PLATFORM_VARIANT"`
|
||||||
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
22
cmd/damon.go
22
cmd/damon.go
|
@ -6,6 +6,8 @@ import (
|
||||||
|
|
||||||
"gitea.com/gitea/act_runner/client"
|
"gitea.com/gitea/act_runner/client"
|
||||||
"gitea.com/gitea/act_runner/engine"
|
"gitea.com/gitea/act_runner/engine"
|
||||||
|
"gitea.com/gitea/act_runner/poller"
|
||||||
|
"golang.org/x/sync/errgroup"
|
||||||
|
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
@ -196,7 +198,27 @@ func runDaemon(ctx context.Context, input *Input) func(cmd *cobra.Command, args
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var g errgroup.Group
|
||||||
|
|
||||||
|
poller := poller.New(cli)
|
||||||
|
|
||||||
|
g.Go(func() error {
|
||||||
|
log.WithField("capacity", cfg.Runner.Capacity).
|
||||||
|
WithField("endpoint", cfg.Client.Address).
|
||||||
|
WithField("os", cfg.Platform.OS).
|
||||||
|
WithField("arch", cfg.Platform.Arch).
|
||||||
|
Infoln("polling the remote server")
|
||||||
|
|
||||||
|
poller.Poll(ctx, cfg.Runner.Capacity)
|
||||||
return nil
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
|
err = g.Wait()
|
||||||
|
if err != nil {
|
||||||
|
log.WithError(err).
|
||||||
|
Errorln("shutting down the server")
|
||||||
|
}
|
||||||
|
return err
|
||||||
// var conn *websocket.Conn
|
// var conn *websocket.Conn
|
||||||
// var err error
|
// var err error
|
||||||
// ticker := time.NewTicker(time.Second)
|
// ticker := time.NewTicker(time.Second)
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -13,6 +13,7 @@ require (
|
||||||
github.com/sirupsen/logrus v1.9.0
|
github.com/sirupsen/logrus v1.9.0
|
||||||
github.com/spf13/cobra v1.5.0
|
github.com/spf13/cobra v1.5.0
|
||||||
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b
|
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b
|
||||||
|
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
@ -61,7 +62,6 @@ require (
|
||||||
github.com/xanzy/ssh-agent v0.3.1 // indirect
|
github.com/xanzy/ssh-agent v0.3.1 // indirect
|
||||||
go.opencensus.io v0.23.0 // indirect
|
go.opencensus.io v0.23.0 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
|
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
|
||||||
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
|
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
|
||||||
golang.org/x/text v0.3.7 // indirect
|
golang.org/x/text v0.3.7 // indirect
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
package poller
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"gitea.com/gitea/act_runner/client"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
func New(cli client.Client) *Poller {
|
||||||
|
return &Poller{
|
||||||
|
Client: cli,
|
||||||
|
routineGroup: newRoutineGroup(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Poller struct {
|
||||||
|
Client client.Client
|
||||||
|
|
||||||
|
routineGroup *routineGroup
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Poller) Poll(ctx context.Context, n int) {
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
func(i int) {
|
||||||
|
p.routineGroup.Run(func() {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
log.Infof("stopped the runner: %d", i+1)
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
log.Infof("stopping the runner: %d", i+1)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := p.poll(ctx, i+1); err != nil {
|
||||||
|
log.WithError(err).Error("poll error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}(i)
|
||||||
|
}
|
||||||
|
p.routineGroup.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Poller) poll(ctx context.Context, thread int) error {
|
||||||
|
log.WithField("thread", thread).Info("poller: request stage from remote server")
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
package poller
|
||||||
|
|
||||||
|
import "sync"
|
||||||
|
|
||||||
|
type routineGroup struct {
|
||||||
|
waitGroup sync.WaitGroup
|
||||||
|
}
|
||||||
|
|
||||||
|
func newRoutineGroup() *routineGroup {
|
||||||
|
return new(routineGroup)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *routineGroup) Run(fn func()) {
|
||||||
|
g.waitGroup.Add(1)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
defer g.waitGroup.Done()
|
||||||
|
fn()
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *routineGroup) Wait() {
|
||||||
|
g.waitGroup.Wait()
|
||||||
|
}
|
Loading…
Reference in New Issue