Skip to content

Commit 80104f6

Browse files
committed
fix: abandonate file description sharing
1 parent ea0e3f6 commit 80104f6

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

internal/tasks/logger.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
)
1515

1616
type Logger struct {
17-
out console.File
18-
1917
status chan *buildkit.SolveStatus
2018
done <-chan struct{}
2119
err error
@@ -52,7 +50,6 @@ func NewTasksLogger(ctx context.Context, mode LoggerMode) (*Logger, error) {
5250

5351
doneChan := make(chan struct{})
5452
logger := &Logger{
55-
out: cons,
5653
status: make(chan *buildkit.SolveStatus),
5754
done: doneChan,
5855
}
@@ -78,7 +75,6 @@ func (l *Logger) CloseAndWait() error {
7875

7976
type LoggerEntry struct {
8077
Logs io.Writer
81-
Fd uintptr
8278

8379
Start func()
8480
Complete func(err error)
@@ -116,7 +112,6 @@ func (l *Logger) AddEntry(name string) *LoggerEntry {
116112

117113
return &LoggerEntry{
118114
Logs: w,
119-
Fd: l.out.Fd(),
120115
Start: func() {
121116
started = time.Now()
122117
l.Write(&buildkit.SolveStatus{

internal/tasks/tasks.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ type TaskFunc[T any, U any] func(t *Task, args T) (nextArgs U, err error)
1313
type CleanupFunc func(ctx context.Context) error
1414

1515
type Task struct {
16-
Name string
17-
Ctx context.Context
18-
Logs io.Writer
19-
LogsFd uintptr
16+
Name string
17+
Ctx context.Context
18+
Logs io.Writer
2019

2120
taskFunction TaskFunc[any, any]
2221
argType reflect.Type
@@ -133,7 +132,6 @@ func (ts *Tasks) Execute(ctx context.Context, data interface{}) (interface{}, er
133132
for i, task := range ts.tasks {
134133
loggerEntries[i] = logger.AddEntry(task.Name)
135134
task.Logs = loggerEntries[i].Logs
136-
task.LogsFd = loggerEntries[i].Fd
137135
}
138136

139137
for i := range ts.tasks {

internal/tasks/tasks_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
func TestGeneric(t *testing.T) {
1818
ts := tasks.Begin()
19+
ts.SetLoggerMode(tasks.PrinterModeQuiet)
1920

2021
tasks.Add(ts, "convert int to string", func(t *tasks.Task, args int) (nextArgs string, err error) {
2122
return fmt.Sprintf("%d", args), nil
@@ -41,6 +42,7 @@ func TestInvalidGeneric(t *testing.T) {
4142
}()
4243

4344
ts := tasks.Begin()
45+
ts.SetLoggerMode(tasks.PrinterModeQuiet)
4446

4547
tasks.Add(ts, "convert int to string", func(t *tasks.Task, args int) (nextArgs string, err error) {
4648
return fmt.Sprintf("%d", args), nil

0 commit comments

Comments
 (0)