Skip to content

Commit 675c88f

Browse files
committed
fixes
1 parent 1e03415 commit 675c88f

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,7 @@ func (svc *RunRunnerSvc) Start(s service.Service) error {
222222
runner.Terminal = terminal
223223
}
224224

225-
//nolint:gosec
226225
ctx, cancel := context.WithCancel(context.Background())
227-
//nolint:gosec
228226
listenerctx, cancelListener := context.WithCancel(context.Background())
229227
svc.stop = func() {
230228
cancelListener()

protocol/logger/job_logger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ type BufferedLiveLogger struct {
254254
data atomic.Pointer[internalBufferedLiveLoggerData]
255255
}
256256

257-
func (logger *BufferedLiveLogger) sendLogs(logchan chan *protocol.TimelineRecordFeedLinesWrapper, logdrain chan struct{}, logfinished chan struct{}) {
257+
func (logger *BufferedLiveLogger) sendLogs(logchan chan *protocol.TimelineRecordFeedLinesWrapper, logdrain, logfinished chan struct{}) {
258258
defer func() {
259259
if r := recover(); r != nil {
260260
log.Printf("panic recovered: %v\n%s", r, debug.Stack())

protocol/logger/job_logger_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"time"
77

88
"github.com/ChristopherHX/github-act-runner/protocol"
9+
910
"github.com/stretchr/testify/require"
1011
)
1112

@@ -60,13 +61,14 @@ func getTestLiveLogger(t *testing.T) LiveLogger {
6061
}
6162

6263
func TestBufferedLiveLoggerDrain(t *testing.T) {
64+
t.Parallel()
6365
bufferedLogger := &BufferedLiveLogger{
6466
LiveLogger: getTestLiveLogger(t),
6567
}
6668

67-
var logchan chan *protocol.TimelineRecordFeedLinesWrapper = make(chan *protocol.TimelineRecordFeedLinesWrapper)
68-
var logdrain chan struct{} = make(chan struct{})
69-
var logfinished chan struct{} = make(chan struct{})
69+
logchan := make(chan *protocol.TimelineRecordFeedLinesWrapper)
70+
logdrain := make(chan struct{})
71+
logfinished := make(chan struct{})
7072

7173
t.Run("forwardLogs", func(t *testing.T) {
7274
t.Parallel()
@@ -89,6 +91,7 @@ func TestBufferedLiveLoggerDrain(t *testing.T) {
8991
}
9092

9193
func TestBufferedLiveLogger(t *testing.T) {
94+
t.Parallel()
9295
bufferedLogger := &BufferedLiveLogger{
9396
LiveLogger: getTestLiveLogger(t),
9497
}

0 commit comments

Comments
 (0)