ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2026-03-24 15:55:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use stateMu instead of closedM to protect r.closed

Browse Source 
Remove the dedicated closedM mutex and use stateMu instead, since
closed is part of the reporter state. RunDaemon reads r.closed under
stateMu.RLock, Close sets it under the existing stateMu.Lock block.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
silverwind
2026-02-19 03:20:13 +01:00
parent 39cef65b52
commit 64ab5fdd51
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/pkg/report/reporter.go
View File

@@ -25,10 +25,9 @@ type Reporter struct {
ctx context.Context ctx context.Context
cancel context.CancelFunc cancel context.CancelFunc
closed bool closed bool
closedM sync.Mutex
client client.Client client client.Client
clientM sync.Mutex clientM sync.Mutex
logOffset int logOffset int
@@ -182,10 +181,11 @@ func (r *Reporter) RunDaemon() {
return return
} }
r.closedM.Lock() r.stateMu.RLock()
defer r.closedM.Unlock() closed := r.closed
r.stateMu.RUnlock()
if r.closed { if closed {
return return
} }
@@ -232,11 +232,8 @@ func (r *Reporter) SetOutputs(outputs map[string]string) {
} }
func (r *Reporter) Close(lastWords string) error { func (r *Reporter) Close(lastWords string) error {
r.closedM.Lock()
r.closed = true
r.closedM.Unlock()
r.stateMu.Lock() r.stateMu.Lock()
r.closed = true
if r.state.Result == runnerv1.Result_RESULT_UNSPECIFIED { if r.state.Result == runnerv1.Result_RESULT_UNSPECIFIED {
if lastWords == "" { if lastWords == "" {
lastWords = "Early termination" lastWords = "Early termination"