From 59dced82374721f22f31cc06dd65876fc65bd44d Mon Sep 17 00:00:00 2001 From: poornas Date: Tue, 17 Mar 2020 15:25:00 -0700 Subject: [PATCH] Print node status even in --quiet mode (#9149) --- cmd/server-startup-msg.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cmd/server-startup-msg.go b/cmd/server-startup-msg.go index f684c63d2..3c9dd138b 100644 --- a/cmd/server-startup-msg.go +++ b/cmd/server-startup-msg.go @@ -25,6 +25,7 @@ import ( "strings" humanize "github.com/dustin/go-humanize" + "github.com/minio/minio/cmd/logger" color "github.com/minio/minio/pkg/color" xnet "github.com/minio/minio/pkg/net" ) @@ -249,8 +250,12 @@ func printObjectAPIMsg() { // Get formatted disk/storage info message. func getStorageInfoMsgSafeMode(storageInfo StorageInfo) string { var msg string + var mcMessage string if storageInfo.Backend.Type == BackendErasure { - diskInfo := fmt.Sprintf(" %d Online, %d Offline. ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum()) + if storageInfo.Backend.OfflineDisks.Sum() > 0 { + mcMessage = "Run `mc admin info` to look for server/disk info`" + } + diskInfo := fmt.Sprintf(" %d Online, %d Offline.%s ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum(), mcMessage) msg += color.Red("Status:") + fmt.Sprintf(getFormatStr(len(diskInfo), 8), diskInfo) } return msg @@ -259,8 +264,12 @@ func getStorageInfoMsgSafeMode(storageInfo StorageInfo) string { // Get formatted disk/storage info message. func getStorageInfoMsg(storageInfo StorageInfo) string { var msg string + var mcMessage string if storageInfo.Backend.Type == BackendErasure { - diskInfo := fmt.Sprintf(" %d Online, %d Offline. ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum()) + if storageInfo.Backend.OfflineDisks.Sum() > 0 { + mcMessage = "Use `mc admin info` to look for server/disk info" + } + diskInfo := fmt.Sprintf(" %d Online, %d Offline.%s ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum(), mcMessage) msg += color.Blue("Status:") + fmt.Sprintf(getFormatStr(len(diskInfo), 8), diskInfo) } return msg @@ -269,6 +278,9 @@ func getStorageInfoMsg(storageInfo StorageInfo) string { // Prints startup message of storage capacity and erasure information. func printStorageInfo(storageInfo StorageInfo) { if msg := getStorageInfoMsg(storageInfo); msg != "" { + if globalCLIContext.Quiet { + logger.Info(msg) + } logStartupMessage(msg) } }