gitea/act_runner
61
107
Fork 79
Code Issues 138 Pull Requests 9 Actions Releases 21 Activity

Add runner name to log #37

Merged
lunny merged 1 commits from Zettat123/act_runner:feat/add-runner-name-to-log into main 2023-03-06 10:42:07 +00:00
Conversation 0 Commits 1 Files Changed 4 +11 -4
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -2,4 +2,8 @@ act_runner
.env
.runner
coverage.txt
/gitea-vet
/gitea-vet
# MS VSCode
.vscode
__debug_bin

3
config/config.go
View File

@ -68,6 +68,9 @@ func FromEnviron() (Config, error) {
if runner.UUID != "" {
cfg.Runner.UUID = runner.UUID
}
if runner.Name != "" {
cfg.Runner.Name = runner.Name
}
if runner.Token != "" {
cfg.Runner.Token = runner.Token
}

2
runtime/runtime.go
View File

@ -30,7 +30,7 @@ func (s *Runner) Run(ctx context.Context, task *runnerv1.Task) error {
env[k] = v
}
env["ACTIONS_CACHE_URL"] = s.CacheHandler.ExternalURL() + "/"
return NewTask(s.ForgeInstance, task.Id, s.Client, env, s.platformPicker).Run(ctx, task)
return NewTask(s.ForgeInstance, task.Id, s.Client, env, s.platformPicker).Run(ctx, task, s.Machine)
}
func (s *Runner) platformPicker(labels []string) string {

4
runtime/task.go
View File

@ -115,7 +115,7 @@ func getToken(task *runnerv1.Task) string {
return token
}
func (t *Task) Run(ctx context.Context, task *runnerv1.Task) (lastErr error) {
func (t *Task) Run(ctx context.Context, task *runnerv1.Task, runnerName string) (lastErr error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
_, exist := globalTaskMap.Load(task.Id)
@ -143,7 +143,7 @@ func (t *Task) Run(ctx context.Context, task *runnerv1.Task) (lastErr error) {
}()
reporter.RunDaemon()
reporter.Logf("received task %v of job %v", task.Id, task.Context.Fields["job"].GetStringValue())
reporter.Logf("%s received task %v of job %v", runnerName, task.Id, task.Context.Fields["job"].GetStringValue())
workflowsPath, err := getWorkflowsPath(t.Input.repoDirectory)
if err != nil {