From 62be56e404aa11a4f47519ff1bc3228995d937fe Mon Sep 17 00:00:00 2001
From: Bastien Chatelard <chatel.bast@gmail.com>
Date: Mon, 23 Dec 2024 09:56:02 +0100
Subject: [PATCH] Exit with code 0 on logs timeout

This is not considered as a error and can be retried
---
 pkg/koyeb/logs.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkg/koyeb/logs.go b/pkg/koyeb/logs.go
index 435d829f..215b632c 100644
--- a/pkg/koyeb/logs.go
+++ b/pkg/koyeb/logs.go
@@ -204,7 +204,7 @@ func (query *WatchLogsQuery) Execute() (chan WatchLogsEntry, error) {
 				// Stop sending ping messages to the websocket connection
 				conn.Stop()
 
-				logs <- WatchLogsEntry{Err: &errors.CLIError{
+				newErr := &errors.CLIError{
 					Icon: "⏰",
 					What: "Disconnected from the logs API",
 					Why:  fmt.Sprintf("forced disconnection after %s", logsTimeout),
@@ -216,7 +216,8 @@ func (query *WatchLogsQuery) Execute() (chan WatchLogsEntry, error) {
 					},
 					Orig:     nil,
 					Solution: "Run the command again to reconnect",
-				}}
+				}
+				log.Errorf("%s", newErr)
 				close(logs)
 			case msg := <-readCh:
 				// Sometimes, for example when passing a future date in --since, the
@@ -326,23 +327,23 @@ func (query *WatchLogsQuery) PrintAll() error {
 	if err != nil {
 		return err
 	}
-	for log := range logs {
-		if log.Err != nil {
-			return log.Err
+	for logl := range logs {
+		if logl.Err != nil {
+			return logl.Err
 		}
 		layout := "2006-01-02 15:04:05"
-		date := log.Date.Format(layout)
-		zone, _ := log.Date.Zone()
+		date := logl.Date.Format(layout)
+		zone, _ := logl.Date.Zone()
 
 		switch outputFormat {
 		case "json", "yaml":
-			data, err := json.Marshal(log)
+			data, err := json.Marshal(logl)
 			if err != nil {
 				return err
 			}
 			fmt.Printf("%s\n", data)
 		default:
-			fmt.Printf("[%s %s] %s %6s - %s\n", date, zone, renderer.FormatID(log.Labels.InstanceID, query.full), log.Stream, log.Msg)
+			fmt.Printf("[%s %s] %s %6s - %s\n", date, zone, renderer.FormatID(logl.Labels.InstanceID, query.full), logl.Stream, logl.Msg)
 		}
 	}
 	return nil