Skip to content

Commit fcc868f

Browse files
Apply suggestions from code review
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 675c88f commit fcc868f

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

actionsdotnetactcompat/action_cache.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ func (cache *ActionCacheBase) GetTarArchive(ctx context.Context, cacheDir, sha,
4040
defer func() {
4141
if r := recover(); r != nil {
4242
log.Printf("panic recovered: %v\n%s", r, debug.Stack())
43+
_ = pw.CloseWithError(fmt.Errorf("panic recovered in GetTarArchive: %v", r))
44+
return
4345
}
46+
_ = pw.Close()
4447
}()
45-
defer func() { _ = pw.Close() }()
4648
writer := tar.NewWriter(pw)
4749
defer func() { _ = writer.Close() }()
4850
reader, err := os.Open(cache.mapping[cacheDir+"@"+sha])

protocol/logger/job_logger.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,7 @@ func (logger *BufferedLiveLogger) SendLog(wrapper *protocol.TimelineRecordFeedLi
338338
select {
339339
case <-data.logdrain:
340340
return errors.New("buffered live logger closing")
341-
default:
342-
data.logchan <- wrapper
341+
case data.logchan <- wrapper:
343342
}
344343
} else {
345344
logchan := make(chan *protocol.TimelineRecordFeedLinesWrapper, websocketPingSize)
@@ -350,7 +349,11 @@ func (logger *BufferedLiveLogger) SendLog(wrapper *protocol.TimelineRecordFeedLi
350349
logfinished: logfinished,
351350
}
352351
if logger.data.CompareAndSwap(data, &ndata) {
353-
ndata.logchan <- wrapper
352+
select {
353+
case <-ndata.logdrain:
354+
return errors.New("buffered live logger closing")
355+
case ndata.logchan <- wrapper:
356+
}
354357
go logger.sendLogs(logchan, ndata.logdrain, logfinished)
355358
} else {
356359
close(ndata.logchan)

0 commit comments

Comments
 (0)