mirror of
https://github.com/minio/minio.git
synced 2025-02-09 04:38:09 -05:00
Merge pull request #381 from fkautz/pr_out_upgrading_iodine
This commit is contained in:
commit
db2ac35da5
2
Godeps/Godeps.json
generated
2
Godeps/Godeps.json
generated
@ -20,7 +20,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/minio-io/iodine",
|
"ImportPath": "github.com/minio-io/iodine",
|
||||||
"Rev": "f92ca01c8671d9565c7aa58e3427364c5e187ccf"
|
"Rev": "2843626767a878d03d02acd4d2bc3790eb325b64"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "gopkg.in/check.v1",
|
"ImportPath": "gopkg.in/check.v1",
|
||||||
|
3
Godeps/_workspace/src/github.com/minio-io/iodine/iodine.go
generated
vendored
3
Godeps/_workspace/src/github.com/minio-io/iodine/iodine.go
generated
vendored
@ -91,6 +91,7 @@ func GetGlobalStateKey(k string) string {
|
|||||||
// New - instantiate an error, turning it into an iodine error.
|
// New - instantiate an error, turning it into an iodine error.
|
||||||
// Adds an initial stack trace.
|
// Adds an initial stack trace.
|
||||||
func New(err error, data map[string]string) *Error {
|
func New(err error, data map[string]string) *Error {
|
||||||
|
if err != nil {
|
||||||
entry := createStackEntry()
|
entry := createStackEntry()
|
||||||
for k, v := range data {
|
for k, v := range data {
|
||||||
entry.Data[k] = v
|
entry.Data[k] = v
|
||||||
@ -100,6 +101,8 @@ func New(err error, data map[string]string) *Error {
|
|||||||
ErrorMessage: err.Error(),
|
ErrorMessage: err.Error(),
|
||||||
Stack: []StackEntry{entry},
|
Stack: []StackEntry{entry},
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// createStackEntry - create stack entries
|
// createStackEntry - create stack entries
|
||||||
|
Loading…
x
Reference in New Issue
Block a user