stop notifications at the server's request

gustavo-iniguez-goya · gustavo-iniguez-goya · commit 5b67e2e53ebe · 2025-12-07T13:14:50.000+01:00
diff --git a/daemon/ui/notifications.go b/daemon/ui/notifications.go
@@ -389,16 +389,20 @@ func (c *Client) listenForNotifications() {
 		case <-c.clientCtx.Done():
 			goto Exit
 		default:
-			noti, err := c.streamNotifications.Recv()
+			ntf, err := c.streamNotifications.Recv()
 			if err == io.EOF {
 				log.Warning("notification channel closed by the server")
 				goto Exit
 			}
 			if err != nil {
-				log.Error("getting notifications: %s %s", err, noti)
+				log.Error("getting notifications: %s %s", err, ntf)
 				goto Exit
 			}
-			c.handleNotification(c.streamNotifications, noti)
+			if ntf.Type <= protocol.Action_NONE {
+				log.Debug("Server ordered to close notifications")
+				goto Exit
+			}
+			c.handleNotification(c.streamNotifications, ntf)
 		}
 	}
 Exit:

Original file line number	Diff line number	Diff line change
`@@ -389,16 +389,20 @@ func (c *Client) listenForNotifications() {`
`389`	`389`	`case <-c.clientCtx.Done():`
`390`	`390`	`goto Exit`
`391`	`391`	`default:`
`392`		`- noti, err := c.streamNotifications.Recv()`
	`392`	`+ ntf, err := c.streamNotifications.Recv()`
`393`	`393`	`if err == io.EOF {`
`394`	`394`	`log.Warning("notification channel closed by the server")`
`395`	`395`	`goto Exit`
`396`	`396`	`}`
`397`	`397`	`if err != nil {`
`398`		`- log.Error("getting notifications: %s %s", err, noti)`
	`398`	`+ log.Error("getting notifications: %s %s", err, ntf)`
`399`	`399`	`goto Exit`
`400`	`400`	`}`
`401`		`- c.handleNotification(c.streamNotifications, noti)`
	`401`	`+ if ntf.Type <= protocol.Action_NONE {`
	`402`	`+ log.Debug("Server ordered to close notifications")`
	`403`	`+ goto Exit`
	`404`	`+ }`
	`405`	`+ c.handleNotification(c.streamNotifications, ntf)`
`402`	`406`	`}`
`403`	`407`	`}`
`404`	`408`	`Exit:`