minio/mc
1
0
Fork 0
mirror of https://github.com/minio/mc.git synced 2025-11-10 13:42:32 +03:00
Code Activity

admin trace: convert trace type to string in json fmt (#4029)

Browse Source
This commit is contained in:
Poorna
2022-03-25 01:52:53 -07:00
committed by GitHub
parent 84a7b83eda
commit d6ffdbc8fb
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/admin-trace.go
View File

@@ -314,7 +314,8 @@ type shortTraceMsg struct {
StorageStats storageStats `json:"storageStats"` StorageStats storageStats `json:"storageStats"`
OSStats osStats `json:"osStats"` OSStats osStats `json:"osStats"`
Type madmin.TraceType `json:"type"` trcType madmin.TraceType `json:"-"`
Type string `json:"type"`
} }
type traceMessage struct { type traceMessage struct {
@@ -357,7 +358,8 @@ type storageStats struct {
} }
type verboseTrace struct { type verboseTrace struct {
Type madmin.TraceType `json:"type"` trcType madmin.TraceType `json:"-"`
Type string `json:"type"`
NodeName string `json:"host"` NodeName string `json:"host"`
FuncName string `json:"api"` FuncName string `json:"api"`
@@ -371,12 +373,24 @@ type verboseTrace struct {
OSStats osStats `json:"osStats"` OSStats osStats `json:"osStats"`
} }
func toTypeStr(t madmin.TraceType) string {
switch t {
case madmin.TraceStorage:
return "STORAGE"
case madmin.TraceOS:
return "OS"
default:
return "S3"
}
}
// return a struct with minimal trace info. // return a struct with minimal trace info.
func shortTrace(ti madmin.ServiceTraceInfo) shortTraceMsg { func shortTrace(ti madmin.ServiceTraceInfo) shortTraceMsg {
s := shortTraceMsg{} s := shortTraceMsg{}
t := ti.Trace t := ti.Trace
s.Type = t.TraceType s.trcType = t.TraceType
s.Type = toTypeStr(t.TraceType)
s.FuncName = t.FuncName s.FuncName = t.FuncName
s.Time = t.Time s.Time = t.Time
@@ -427,7 +441,7 @@ func (s shortTraceMsg) String() string {
} }
fmt.Fprintf(b, "%s ", s.Time.Local().Format(timeFormat)) fmt.Fprintf(b, "%s ", s.Time.Local().Format(timeFormat))
switch s.Type { switch s.trcType {
case madmin.TraceStorage: case madmin.TraceStorage:
fmt.Fprintf(b, "[%s] %s %s %s %2s", console.Colorize("RespStatus", "STORAGE"), console.Colorize("FuncName", s.FuncName), fmt.Fprintf(b, "[%s] %s %s %s %2s", console.Colorize("RespStatus", "STORAGE"), console.Colorize("FuncName", s.FuncName),
hostStr, hostStr,
@@ -492,7 +506,8 @@ func (t traceMessage) JSON() string {
rspHdrs[k] = strings.Join(v, " ") rspHdrs[k] = strings.Join(v, " ")
} }
trc := verboseTrace{ trc := verboseTrace{
Type: t.Trace.TraceType, trcType: t.Trace.TraceType,
Type: toTypeStr(t.Trace.TraceType),
NodeName: t.Trace.NodeName, NodeName: t.Trace.NodeName,
FuncName: t.Trace.FuncName, FuncName: t.Trace.FuncName,
Time: t.Trace.Time, Time: t.Trace.Time,