watchRelease now uses logs instead of monitoring

cmd/deploy.go

@@ -27,7 +27,7 @@ import (
 	"github.com/superfly/flyctl/internal/cmdutil"
 	"github.com/superfly/flyctl/internal/deployment"
 	"github.com/superfly/flyctl/internal/flyerr"
-	"github.com/superfly/flyctl/internal/monitor"
+	"github.com/superfly/flyctl/pkg/logs"
 	"github.com/superfly/flyctl/terminal"
 	"golang.org/x/sync/errgroup"
 )
@@ -269,31 +269,30 @@ func watchReleaseCommand(ctx context.Context, cc *cmdctx.CmdContext, apiClient *
 				ctx, cancel := context.WithCancel(ctx)
 				defer cancel()
 
-				ls := monitor.NewLogStream(cc.Client.API())
-				opts := monitor.LogOptions{MaxBackoff: 1 * time.Second, AppName: cc.AppName, VMID: vmid}
+				opts := &logs.LogOptions{MaxBackoff: 1 * time.Second, AppName: cc.AppName, VMID: vmid}
 
-				for logs := range ls.Stream(ctx, opts) {
-					if len(logs) == 0 {
-						continue
-					}
+				ls, err := logs.NewNatsStream(apiClient, opts)
+				if err != nil {
+					return err
+				}
+
+				for entry := range ls.Stream(ctx, opts) {
 
 					func() {
 						if interactive {
 							s.Stop()
 							defer s.Start()
 						}
 
-						for _, l := range logs {
-							fmt.Println("\t", l.Message)
+						fmt.Println("\t", entry.Message)
 
-							// watch for the shutdown message
-							if l.Message == "Starting clean up." {
-								cancel()
-							}
+						// watch for the shutdown message
+						if entry.Message == "Starting clean up." {
+							cancel()
 						}
+
 					}()
 				}
-
 				return ls.Err()
 			})
 		})