fix: Handling missing log file error in server logs (#838)

Signed-off-by: mobley-trent <[email protected]>

docs/daytona_server_logs.md

@@ -11,6 +11,7 @@ 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

hack/docs/daytona_server_logs.yaml

@@ -9,6 +9,10 @@ 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"

internal/util/apiclient/websocket_log_reader.go

@@ -18,7 +18,7 @@ var workspaceLogsStarted bool
 
 func ReadWorkspaceLogs(activeProfile config.Profile, workspaceId string, projectNames []string, stopLogs *bool) {
 	var wg sync.WaitGroup
-	query := "follow=true"
+	query := "follow=true&retry=true"
 
 	logs_view.CalculateLongestPrefixLength(projectNames)
 

internal/util/log_reader.go

@@ -37,8 +37,9 @@ func ReadLog(ctx context.Context, logReader io.Reader, follow bool, c chan []byt
 	}
 }
 
-func ReadJSONLog(ctx context.Context, logReader io.Reader, follow bool, c chan interface{}, errChan chan error) {
+func ReadJSONLog(ctx context.Context, logReader io.Reader, follow bool, retry bool, c chan interface{}, errChan chan error) {
 	var buffer bytes.Buffer
+	var err error
 	reader := bufio.NewReader(logReader)
 	delimiter := []byte(logs.LogDelimiter)
 
@@ -48,16 +49,31 @@ func ReadJSONLog(ctx context.Context, logReader io.Reader, follow bool, c chan i
 			return
 		default:
 			byteChunk := make([]byte, 1024)
-			n, err := reader.Read(byteChunk)
-			if err != nil {
-				if err != io.EOF {
-					errChan <- err
-				} else if !follow {
-					errChan <- io.EOF
-					return
+
+			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
+					}
+				}
+				buffer.Write(byteChunk[:n])
 			}
-			buffer.Write(byteChunk[:n])
+
 			data := buffer.Bytes()
 
 			index := bytes.Index(data, delimiter)

pkg/api/controllers/log/websocket.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"io"
 	"net/http"
+	"time"
 
 	"github.com/daytonaio/daytona/internal/util"
 	"github.com/daytonaio/daytona/pkg/server"
@@ -15,6 +16,8 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+const TIMEOUT = 300 * time.Millisecond
+
 var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool {
 		return true
@@ -97,6 +100,8 @@ 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 {
@@ -110,7 +115,7 @@ func readJSONLog(ginCtx *gin.Context, logReader io.Reader) {
 	ctx, cancel := context.WithCancel(context.Background())
 
 	defer cancel()
-	go util.ReadJSONLog(ctx, logReader, follow, msgChannel, errChannel)
+	go util.ReadJSONLog(ctx, logReader, follow, retry, msgChannel, errChannel)
 	go writeJSONToWs(ws, msgChannel, errChannel)
 
 	go func() {
@@ -148,6 +153,19 @@ func readJSONLog(ginCtx *gin.Context, logReader io.Reader) {
 
 func ReadServerLog(ginCtx *gin.Context) {
 	server := server.GetInstance(nil)
+	retryQuery := ginCtx.DefaultQuery("retry", "true")
+	retry := retryQuery == "true"
+
+	if retry {
+		for {
+			reader, err := server.GetLogReader()
+			if err == nil {
+				readLog(ginCtx, reader)
+				return
+			}
+			time.Sleep(TIMEOUT)
+		}
+	}
 
 	reader, err := server.GetLogReader()
 	if err != nil {
@@ -160,9 +178,22 @@ func ReadServerLog(ginCtx *gin.Context) {
 
 func ReadWorkspaceLog(ginCtx *gin.Context) {
 	workspaceId := ginCtx.Param("workspaceId")
+	retryQuery := ginCtx.DefaultQuery("retry", "true")
+	retry := retryQuery == "true"
 
 	server := server.GetInstance(nil)
 
+	if retry {
+		for {
+			wsLogReader, err := server.WorkspaceService.GetWorkspaceLogReader(workspaceId)
+			if err == nil {
+				readJSONLog(ginCtx, wsLogReader)
+				return
+			}
+			time.Sleep(TIMEOUT)
+		}
+	}
+
 	wsLogReader, err := server.WorkspaceService.GetWorkspaceLogReader(workspaceId)
 	if err != nil {
 		ginCtx.AbortWithError(http.StatusInternalServerError, err)
@@ -175,9 +206,22 @@ func ReadWorkspaceLog(ginCtx *gin.Context) {
 func ReadProjectLog(ginCtx *gin.Context) {
 	workspaceId := ginCtx.Param("workspaceId")
 	projectName := ginCtx.Param("projectName")
+	retryQuery := ginCtx.DefaultQuery("retry", "true")
+	retry := retryQuery == "true"
 
 	server := server.GetInstance(nil)
 
+	if retry {
+		for {
+			projectLogReader, err := server.WorkspaceService.GetProjectLogReader(workspaceId, projectName)
+			if err == nil {
+				readJSONLog(ginCtx, projectLogReader)
+				return
+			}
+			time.Sleep(TIMEOUT)
+		}
+	}
+
 	projectLogReader, err := server.WorkspaceService.GetProjectLogReader(workspaceId, projectName)
 	if err != nil {
 		ginCtx.AbortWithError(http.StatusInternalServerError, err)

pkg/cmd/server/logs.go

@@ -20,6 +20,7 @@ import (
 )
 
 var followFlag bool
+var retryFlag bool
 var fileFlag bool
 
 var logsCmd = &cobra.Command{
@@ -37,8 +38,12 @@ var logsCmd = &cobra.Command{
 		}
 
 		query := ""
-		if followFlag {
-			query = "follow=true"
+		if retryFlag && followFlag {
+			query += "follow=true&retry=true"
+		} else if retryFlag {
+			query += "retry=true"
+		} else if followFlag {
+			query += "follow=true"
 		}
 
 		switch {
@@ -123,5 +128,6 @@ 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")
 }