Skip to content

Fix logs operator command, prevent aborting streaming after 30s #14

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

Open
mclasmeier wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix logs operator command, prevent aborting streaming after 30s #14

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
272245f
Use Logger interface.
mclasmeier Dec 2, 2025
15d1827
Rework 'logs operator' command, leverage logger.
mclasmeier Dec 2, 2025
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
48 changes: 36 additions & 12 deletions cmd/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"bufio"
"bytes"
"context"
"fmt"
"io"
Expand All @@ -12,6 +13,7 @@ import (

"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/stackrox/roxie/internal/logger"
)

var (
Expand Down Expand Up @@ -43,7 +45,38 @@ func newLogsOperatorCmd() *cobra.Command {
return cmd
}

func runLogsOperator(cmd *cobra.Command, args []string) error {
// validateClusterConnection checks if the cluster is reachable.
func validateClusterConnection(logger logger.Logger, ctx context.Context) error {
cmd := exec.CommandContext(ctx, "kubectl", "get", "namespaces")

var stderr bytes.Buffer
cmd.Stderr = &stderr
cmd.Stdout = io.Discard

if err := cmd.Run(); err != nil {
for _, stderrLine := range strings.Split(stderr.String(), "\n") {
logger.Dim(stderrLine)
}
if ctx.Err() == context.DeadlineExceeded {
return fmt.Errorf("timeout connecting to cluster - ensure your kubeconfig is correct and the cluster is reachable")
}
return fmt.Errorf("failed to connect to cluster: %w", err)
}
return nil
}

func runLogsOperator(_ *cobra.Command, args []string) error {
logger := logger.New()

// Validate cluster connection first (fast-fail)
validateCtx, validateCancel := context.WithTimeout(context.Background(), 30*time.Second)
defer validateCancel()

if err := validateClusterConnection(logger, validateCtx); err != nil {
validateCancel()
return err
}

// Build kubectl command
kubectlArgs := []string{
"-n", "rhacs-operator-system",
Expand All @@ -55,13 +88,8 @@ func runLogsOperator(cmd *cobra.Command, args []string) error {
kubectlArgs = append(kubectlArgs, "-f")
}

// Create context with timeout for initial connection
// Use a longer timeout (30s) to allow for cluster connection
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()

// Create kubectl command with context
kubectlCmd := exec.CommandContext(ctx, "kubectl", kubectlArgs...)
// Create kubectl command without context - allows indefinite streaming.

@porridge porridge Dec 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Shouldn't we use a context with cancel instead and call defer cancel() here?

@mclasmeier mclasmeier Dec 8, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

You mean something like context.Background()? What would be the advantage over not providing a context?

@porridge porridge Dec 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I meant background wrapped in https://pkg.go.dev/context#WithCancel
Or is it not worth bothering to cancel() because the only way to exit is to die anway?

kubectlCmd := exec.Command("kubectl", kubectlArgs...)

// Get stdout pipe for streaming
stdout, err := kubectlCmd.StdoutPipe()
Expand All @@ -82,10 +110,6 @@ func runLogsOperator(cmd *cobra.Command, args []string) error {

// Wait for command to complete
if err := kubectlCmd.Wait(); err != nil {
// Check if it was a timeout
if ctx.Err() == context.DeadlineExceeded {
return fmt.Errorf("timeout connecting to cluster - ensure your kubeconfig is correct and the cluster is reachable")
}
// Don't return error if kubectl was interrupted (e.g., Ctrl+C)
if _, ok := err.(*exec.ExitError); ok {
return nil
Expand Down