[cli] Code refactoring

essentialkaos · Sep 15, 2023 · 10f1be3 · 10f1be3
1 parent 1d0c98a
commit 10f1be3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cli/command_clients.go b/cli/command_clients.go
@@ -51,7 +51,10 @@ func ClientsCommand(args CommandArgs) int {
 	req := &REDIS.Request{
 		Command: []string{"CLIENT", "LIST", "TYPE", "NORMAL"},
 		Port:    CORE.GetInstancePort(id),
-		Auth:    REDIS.Auth{CORE.REDIS_USER_ADMIN, meta.Preferencies.AdminPassword},
+		Auth: REDIS.Auth{
+			User:     CORE.REDIS_USER_ADMIN,
+			Password: meta.Preferencies.AdminPassword,
+		},
 		Timeout: time.Second,
 	}
 

diff --git a/cli/common.go b/cli/common.go
@@ -472,11 +472,12 @@ func warnAboutUnsafeAction(id int, message string) bool {
 		case 5:
 			ops, err := getCurrentInstanceTraffic(id)
 
-			if ops > 10 {
+			switch {
+			case ops > 10:
 				terminal.Warn("There is some traffic on the instance (%d ops/s).", ops)
-			} else if err != nil {
+			case err != nil:
 				terminal.Warn("Can't measure the number of operations on the instance.")
-			} else {
+			default:
 				continue
 			}
 		}