Merge pull request #10 from threefoldtech/update-disks-error-messages

Update disks error messages

Author: Eslam-Nawara

cmds/modules/powerd/main.go

@@ -37,6 +37,7 @@ var Module cli.Command = cli.Command{
 func action(cli *cli.Context) error {
 	var (
 		msgBrokerCon string = cli.String("broker")
+		powerdLabel  string = "powerd"
 	)
 
 	ctx, _ := utils.WithSignal(cli.Context)
@@ -51,16 +52,28 @@ func action(cli *cli.Context) error {
 		return errors.Wrap(err, "failed to connect to message broker server")
 	}
 
+	zui := stubs.NewZUIStub(cl)
+	// empty out zui errors for powerd
+	if zuiErr := zui.PushErrors(cli.Context, powerdLabel, []string{}); zuiErr != nil {
+		log.Info().Err(zuiErr).Send()
+	}
+
 	identity := stubs.NewIdentityManagerStub(cl)
 	register := stubs.NewRegistrarStub(cl)
 
 	nodeID, err := register.NodeID(ctx)
 	if err != nil {
+		if zuiErr := zui.PushErrors(cli.Context, powerdLabel, []string{err.Error()}); zuiErr != nil {
+			log.Info().Err(zuiErr).Send()
+		}
 		return errors.Wrap(err, "failed to get node id")
 	}
 
 	twinID, err := register.TwinID(ctx)
 	if err != nil {
+		if zuiErr := zui.PushErrors(cli.Context, powerdLabel, []string{err.Error()}); zuiErr != nil {
+			log.Info().Err(zuiErr).Send()
+		}
 		return errors.Wrap(err, "failed to get twin id")
 	}
 

cmds/modules/zui/header.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/gizak/termui/v3/widgets"
 	"github.com/pkg/errors"
+
+	"github.com/rs/zerolog/log"
 	"github.com/threefoldtech/zbus"
 	"github.com/threefoldtech/zos/pkg/app"
 	"github.com/threefoldtech/zos/pkg/environment"
@@ -54,6 +56,14 @@ func headerRenderer(ctx context.Context, c zbus.Client, h *widgets.Paragraph, r
 	}
 
 	go func() {
+		registrarLable := "registrar"
+		zui := stubs.NewZUIStub(c)
+
+		// empty out zui errors for registrar
+		if zuiErr := zui.PushErrors(ctx, registrarLable, []string{}); zuiErr != nil {
+			log.Info().Err(zuiErr).Send()
+		}
+
 		farmID, _ := identity.FarmID(ctx)
 		for version := range ch {
 			var name string
@@ -69,15 +79,18 @@ func headerRenderer(ctx context.Context, c zbus.Client, h *widgets.Paragraph, r
 				if isInProgressError(err) {
 					nodeID = green(err.Error())
 				} else {
-					nodeID = red(err.Error())
+					nodeID = red(fmt.Sprintf("%d (unregistered)", node))
+					if zuiErr := zui.PushErrors(ctx, registrarLable, []string{err.Error()}); zuiErr != nil {
+						log.Info().Err(zuiErr).Send()
+					}
 				}
 			} else {
 				nodeID = green(fmt.Sprint(node))
 			}
 
 			cache := green("OK")
 			if app.CheckFlag(app.LimitedCache) {
-				cache = red("no ssd disks detected")
+				cache = red("no ssd disks detected, running on hdd-only mode")
 			} else if app.CheckFlag(app.ReadonlyCache) {
 				cache = red("cache is read-only")
 			}