diff --git a/docs/daytona_server_logs.md b/docs/daytona_server_logs.md index 44f64dbe77..5b8243e0bb 100644 --- a/docs/daytona_server_logs.md +++ b/docs/daytona_server_logs.md @@ -11,7 +11,6 @@ daytona server logs [flags] ``` --file Read logs from local server log file -f, --follow Follow logs - -r, --retry Retry connection ``` ### Options inherited from parent commands diff --git a/hack/docs/daytona_server_logs.yaml b/hack/docs/daytona_server_logs.yaml index db045c2dfb..d74af54876 100644 --- a/hack/docs/daytona_server_logs.yaml +++ b/hack/docs/daytona_server_logs.yaml @@ -9,10 +9,6 @@ options: shorthand: f default_value: "false" usage: Follow logs - - name: retry - shorthand: r - default_value: "false" - usage: Retry connection inherited_options: - name: help default_value: "false" diff --git a/internal/util/apiclient/websocket_log_reader.go b/internal/util/apiclient/websocket_log_reader.go index ca2a3509b5..aa54bfd645 100644 --- a/internal/util/apiclient/websocket_log_reader.go +++ b/internal/util/apiclient/websocket_log_reader.go @@ -19,7 +19,7 @@ var workspaceLogsStarted bool func ReadWorkspaceLogs(activeProfile config.Profile, workspaceId string, projectNames []string, stopLogs *bool) { var wg sync.WaitGroup - query := "follow=true&retry=true" + query := "follow=true" logs_view.CalculateLongestPrefixLength(projectNames) diff --git a/internal/util/log_reader.go b/internal/util/log_reader.go index ee445e8479..f3ebcd0f79 100644 --- a/internal/util/log_reader.go +++ b/internal/util/log_reader.go @@ -37,9 +37,8 @@ func ReadLog(ctx context.Context, logReader io.Reader, follow bool, c chan []byt } } -func ReadJSONLog(ctx context.Context, logReader io.Reader, follow bool, retry bool, c chan interface{}, errChan chan error) { +func ReadJSONLog(ctx context.Context, logReader io.Reader, follow bool, c chan interface{}, errChan chan error) { var buffer bytes.Buffer - var err error reader := bufio.NewReader(logReader) delimiter := []byte(logs.LogDelimiter) @@ -50,29 +49,16 @@ func ReadJSONLog(ctx context.Context, logReader io.Reader, follow bool, retry bo default: byteChunk := make([]byte, 1024) - if retry { - for { - n, err := reader.Read(byteChunk) - if err == nil { - buffer.Write(byteChunk[:n]) - break - } else if !follow && err == io.EOF { - errChan <- io.EOF - return - } - } - } else { - n, err := reader.Read(byteChunk) - if err != nil { - if err != io.EOF { - errChan <- err - } else if !follow { - errChan <- io.EOF - return - } + n, err := reader.Read(byteChunk) + if err != nil { + if err != io.EOF { + errChan <- err + } else if !follow { + errChan <- io.EOF + return } - buffer.Write(byteChunk[:n]) } + buffer.Write(byteChunk[:n]) data := buffer.Bytes() diff --git a/pkg/api/controllers/log/websocket.go b/pkg/api/controllers/log/websocket.go index a84d9b0119..0e3916b698 100644 --- a/pkg/api/controllers/log/websocket.go +++ b/pkg/api/controllers/log/websocket.go @@ -100,8 +100,6 @@ func writeJSONToWs(ws *websocket.Conn, c chan interface{}, errChan chan error) { func readJSONLog(ginCtx *gin.Context, logReader io.Reader) { followQuery := ginCtx.Query("follow") follow := followQuery == "true" - retryQuery := ginCtx.Query("retry") - retry := retryQuery == "true" ws, err := upgrader.Upgrade(ginCtx.Writer, ginCtx.Request, nil) if err != nil { @@ -115,7 +113,7 @@ func readJSONLog(ginCtx *gin.Context, logReader io.Reader) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - go util.ReadJSONLog(ctx, logReader, follow, retry, msgChannel, errChannel) + go util.ReadJSONLog(ctx, logReader, follow, msgChannel, errChannel) go writeJSONToWs(ws, msgChannel, errChannel) go func() { diff --git a/pkg/cmd/server/logs.go b/pkg/cmd/server/logs.go index 28ba4cae62..0363fb32f3 100644 --- a/pkg/cmd/server/logs.go +++ b/pkg/cmd/server/logs.go @@ -20,7 +20,6 @@ import ( ) var followFlag bool -var retryFlag bool var fileFlag bool var logsCmd = &cobra.Command{ @@ -38,11 +37,7 @@ var logsCmd = &cobra.Command{ } query := "" - if retryFlag && followFlag { - query += "follow=true&retry=true" - } else if retryFlag { - query += "retry=true" - } else if followFlag { + if followFlag { query += "follow=true" } @@ -128,6 +123,5 @@ func readServerLogFile() { func init() { logsCmd.Flags().BoolVarP(&followFlag, "follow", "f", false, "Follow logs") - logsCmd.Flags().BoolVarP(&retryFlag, "retry", "r", false, "Retry connection") logsCmd.Flags().BoolVar(&fileFlag, "file", false, "Read logs from local server log file") }