From d4c1515f4ef6ebe732d8bee9cd6f3e019d1560fb Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Fri, 14 Oct 2022 10:06:52 +0800
Subject: [PATCH] chore(runner): update runner status if start program
---
README.md | 2 +-
client/http.go | 1 +
cmd/daemon.go | 26 +++++++++++++++++++++++++-
go.mod | 2 +-
go.sum | 6 ++----
poller/poller.go | 5 +----
6 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index eee5eef..298050b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ create a new file as name `.env`
```sh
GITEA_RUNNER_NAME=foobar
-GITEA_RUNNER_URL=localhost:3001/foo/bar
+GITEA_RUNNER_URL=http://localhost:3000/foo/bar
GITEA_RUNNER_TOKEN=1234567890abcde
GITEA_RUNNER_LABELS=foo,bar
```
diff --git a/client/http.go b/client/http.go
index 6acdd98..77a1911 100644
--- a/client/http.go
+++ b/client/http.go
@@ -30,6 +30,7 @@ func New(endpoint, secret string, opts ...Option) *HTTPClient {
return next(ctx, req)
}
})
+
cfg.opts = append(cfg.opts, connect.WithInterceptors(interceptor))
if cfg.httpClient == nil {
diff --git a/cmd/daemon.go b/cmd/daemon.go
index cf00918..62c2fb8 100644
--- a/cmd/daemon.go
+++ b/cmd/daemon.go
@@ -9,8 +9,9 @@ import (
"gitea.com/gitea/act_runner/engine"
"gitea.com/gitea/act_runner/poller"
"gitea.com/gitea/act_runner/runtime"
-
pingv1 "gitea.com/gitea/proto-go/ping/v1"
+ runnerv1 "gitea.com/gitea/proto-go/runner/v1"
+
"github.com/bufbuild/connect-go"
"github.com/joho/godotenv"
log "github.com/sirupsen/logrus"
@@ -98,9 +99,32 @@ func runDaemon(ctx context.Context, task *runtime.Task) func(cmd *cobra.Command,
return err
}
+ // update runner status to idle
+ log.Infoln("update runner status to idle")
+ if _, err := cli.UpdateRunner(
+ context.Background(),
+ connect.NewRequest(&runnerv1.UpdateRunnerRequest{
+ Status: runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE,
+ }),
+ ); err != nil {
+ return err
+ }
+
return poller.Poll(ctx, cfg.Runner.Capacity)
})
+ g.Go(func() error {
+ <-ctx.Done()
+ log.Infoln("update runner status to offline")
+ _, err := cli.UpdateRunner(
+ context.Background(),
+ connect.NewRequest(&runnerv1.UpdateRunnerRequest{
+ Status: runnerv1.RunnerStatus_RUNNER_STATUS_OFFLINE,
+ }),
+ )
+ return err
+ })
+
err = g.Wait()
if err != nil {
log.WithError(err).
diff --git a/go.mod b/go.mod
index 1ff7331..75f02dc 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module gitea.com/gitea/act_runner
go 1.18
require (
- gitea.com/gitea/proto-go v0.0.0-20221007122649-939e445f4abb
+ gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a
github.com/appleboy/com v0.1.6
github.com/avast/retry-go/v4 v4.1.0
github.com/bufbuild/connect-go v0.5.0
diff --git a/go.sum b/go.sum
index a687785..0f7d7bf 100644
--- a/go.sum
+++ b/go.sum
@@ -25,10 +25,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa h1:HHqlvfIvqFlny3sgJgAM1BYeLNr1uM4yXtvF7aAoYK8=
gitea.com/gitea/act v0.0.0-20220922135643-52a5bba9e7fa/go.mod h1:9W/Nz16tjfnWp7O5DUo3EjZBnZFBI/5rlWstX4o7+hU=
-gitea.com/gitea/proto-go v0.0.0-20221002020351-750a3b99a850 h1:BDnr9A52zCPb5BH64yTm8cIfhhjTvql0u6QvWjJViGo=
-gitea.com/gitea/proto-go v0.0.0-20221002020351-750a3b99a850/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y=
-gitea.com/gitea/proto-go v0.0.0-20221007122649-939e445f4abb h1:Wi8BEd1hStpvZW0PUP6W74mQRMJOJ/EhPoqWW5dcHQc=
-gitea.com/gitea/proto-go v0.0.0-20221007122649-939e445f4abb/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y=
+gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a h1:WHNPcbDR2vw2a17Ml06+n4MC0UwsyD/F3WeVteaXWMI=
+gitea.com/gitea/proto-go v0.0.0-20221013073523-69d53451957a/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y=
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
diff --git a/poller/poller.go b/poller/poller.go
index 234d761..a4b725a 100644
--- a/poller/poller.go
+++ b/poller/poller.go
@@ -126,10 +126,7 @@ 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{
- Os: p.Filter.OS,
- Arch: p.Filter.Arch,
- }))
+ resp, err := p.Client.FetchTask(ctx, connect.NewRequest(&runnerv1.FetchTaskRequest{}))
if err == context.Canceled || err == context.DeadlineExceeded {
l.WithError(err).Trace("poller: no stage returned")
p.errorRetryCounter++