From 27b8f18cce9b63b9119995d7454a41a757b03bc4 Mon Sep 17 00:00:00 2001 From: poornas Date: Sat, 21 Mar 2020 10:02:20 -0700 Subject: [PATCH] Fix storage info message on startup (#9177) --- cmd/server-startup-msg.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cmd/server-startup-msg.go b/cmd/server-startup-msg.go index 5ca738cf4..bc11176fd 100644 --- a/cmd/server-startup-msg.go +++ b/cmd/server-startup-msg.go @@ -253,11 +253,14 @@ func getStorageInfoMsgSafeMode(storageInfo StorageInfo) string { var mcMessage string if storageInfo.Backend.Type == BackendErasure { if storageInfo.Backend.OfflineDisks.Sum() > 0 { - mcMessage = "Run `mc admin info` to look for server/disk info`" + mcMessage = "Use `mc admin info` to look for latest server/disk info`" } - diskInfo := fmt.Sprintf(" %d Online, %d Offline.%s ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum(), mcMessage) + diskInfo := fmt.Sprintf(" %d Online, %d Offline. ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum()) msg += color.Red("Status:") + fmt.Sprintf(getFormatStr(len(diskInfo), 8), diskInfo) } + if len(mcMessage) > 0 { + msg = fmt.Sprintf("%s %s", mcMessage, msg) + } return msg } @@ -267,10 +270,14 @@ func getStorageInfoMsg(storageInfo StorageInfo) string { var mcMessage string if storageInfo.Backend.Type == BackendErasure { if storageInfo.Backend.OfflineDisks.Sum() > 0 { - mcMessage = "Use `mc admin info` to look for server/disk info" + mcMessage = "Use `mc admin info` to look for latest server/disk info" } - diskInfo := fmt.Sprintf(" %d Online, %d Offline.%s ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum(), mcMessage) + + diskInfo := fmt.Sprintf(" %d Online, %d Offline. ", storageInfo.Backend.OnlineDisks.Sum(), storageInfo.Backend.OfflineDisks.Sum()) msg += color.Blue("Status:") + fmt.Sprintf(getFormatStr(len(diskInfo), 8), diskInfo) + if len(mcMessage) > 0 { + msg = fmt.Sprintf("%s %s", mcMessage, msg) + } } return msg }