mirror of
https://github.com/minio/mc
synced 2026-08-29 14:37:42 -04:00
3b5dcd478a
Outputs for recursive today ``` $ mc ls -r /tmp/value/ [2016-01-25 12:27:01 PST] 52B test.go [2016-01-26 11:36:22 PST] 4.2KiB test.txt [2016-01-26 11:45:22 PST] 102B test/ [2016-01-26 11:45:22 PST] 4.2KiB test/README.md ``` and Outputs for non recursive today differ lexically. ``` $ mc ls /tmp/value/ [2016-01-26 11:45:22 PST] 102B test/ [2016-01-25 12:27:01 PST] 52B test.go [2016-01-26 11:36:22 PST] 4.2KiB test.txt ``` To fix this issue we need to capture the ending '/' as well part of the names while sorting the output. This patch addresses this problem.
115 lines
2.8 KiB
Go
115 lines
2.8 KiB
Go
/*
|
|
* Minio Client (C) 2014, 2015 Minio, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/minio/mc/pkg/console"
|
|
"github.com/minio/minio-xl/pkg/probe"
|
|
)
|
|
|
|
// causeMessage container for golang error messages
|
|
type causeMessage struct {
|
|
Message string `json:"message"`
|
|
Error error `json:"error"`
|
|
}
|
|
|
|
// errorMessage container for error messages
|
|
type errorMessage struct {
|
|
Message string `json:"message"`
|
|
Cause causeMessage `json:"cause"`
|
|
Type string `json:"type"`
|
|
CallTrace []probe.TracePoint `json:"trace,omitempty"`
|
|
SysInfo map[string]string `json:"sysinfo"`
|
|
}
|
|
|
|
// fatalIf wrapper function which takes error and selectively prints stack frames if available on debug
|
|
func fatalIf(err *probe.Error, msg string) {
|
|
if err == nil {
|
|
return
|
|
}
|
|
if globalJSON {
|
|
errorMsg := errorMessage{
|
|
Message: msg,
|
|
Type: "fatal",
|
|
Cause: causeMessage{
|
|
Message: err.ToGoError().Error(),
|
|
Error: err.ToGoError(),
|
|
},
|
|
SysInfo: err.SysInfo,
|
|
}
|
|
if globalDebug {
|
|
errorMsg.CallTrace = err.CallTrace
|
|
}
|
|
json, e := json.Marshal(struct {
|
|
Status string `json:"status"`
|
|
Error errorMessage `json:"error"`
|
|
}{
|
|
Status: "error",
|
|
Error: errorMsg,
|
|
})
|
|
if e != nil {
|
|
console.Fatalln(probe.NewError(e))
|
|
}
|
|
console.Println(string(json))
|
|
console.Fatalln()
|
|
}
|
|
if !globalDebug {
|
|
console.Fatalln(fmt.Sprintf("%s %s", msg, err.ToGoError()))
|
|
}
|
|
console.Fatalln(fmt.Sprintf("%s %s", msg, err))
|
|
}
|
|
|
|
// errorIf synonymous with fatalIf but doesn't exit on error != nil
|
|
func errorIf(err *probe.Error, msg string) {
|
|
if err == nil {
|
|
return
|
|
}
|
|
if globalJSON {
|
|
errorMsg := errorMessage{
|
|
Message: msg,
|
|
Type: "error",
|
|
Cause: causeMessage{
|
|
Message: err.ToGoError().Error(),
|
|
Error: err.ToGoError(),
|
|
},
|
|
SysInfo: err.SysInfo,
|
|
}
|
|
if globalDebug {
|
|
errorMsg.CallTrace = err.CallTrace
|
|
}
|
|
json, e := json.Marshal(struct {
|
|
Status string `json:"status"`
|
|
Error errorMessage `json:"error"`
|
|
}{
|
|
Status: "error",
|
|
Error: errorMsg,
|
|
})
|
|
if e != nil {
|
|
console.Fatalln(probe.NewError(e))
|
|
}
|
|
console.Println(string(json))
|
|
return
|
|
}
|
|
if !globalDebug {
|
|
console.Errorln(fmt.Sprintf("%s %s", msg, err.ToGoError()))
|
|
return
|
|
}
|
|
console.Errorln(fmt.Sprintf("%s %s", msg, err))
|
|
}
|