Skip to content

fix: Resolve the error in reading container logs #8965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Jun 9, 2025
Merged

fix: Resolve the error in reading container logs #8965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/app/service/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ func collectLogs(params dto.StreamLog, messageChan chan<- string, errorChan chan
message := scanner.Text()
select {
case messageChan <- message:
case <-time.After(time.Second):
case <-time.After(5 * time.Second):
errorChan <- fmt.Errorf("message channel blocked")
return
}
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code snippet has an issue where errorChan is written to after it has already been closed, which can lead to a runtime panic if any goroutines attempt to write to it afterwards. The correct approach would be to check whether errorChan is still open before writing to it.

Additionally, there's some redundancy in the use of select, since both conditions inside the select block (<-messageChan) and <-time.After() handle the same message processing logic. This could potentially make the code less readable. A more efficient way would be to have a separate channel specifically for handling timeout errors or using a timer that closes itself directly when a message is read from the other channel within its interval:

func collectLogs(params dto.StreamLog, messageChan chan<- string, errorChan chan<- error) {
    scanner := bufio.NewScanner(io.Reader)
    go func() {
        defer scanner.Close()

        timer := time.NewTimer(5 * time.Second)
        defer timer.Stop()

        for message := scanner.Text(); ; message = strings.TrimSpace(scanner.Text()), timer.Reset(5*time.Second) {
            select {
            case messageChan <- message:
                return // Exit loop on successful message transmission
            case <-errorChan:
                return // Exit loop if channel is closed (e.g., due to context cancellation)
            case <-timer.C: // Timeout reached before log message received
                errorChan <- fmt.Errorf("message channel blocked")
                return
            }
        }
    }()
}

This change ensures better resource management by closing the timer upon receiving a valid log message or encountering an immediate error condition. It also removes redundant logic within the loop.

Expand Down
Loading