opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-02 12:20:03 +08:00
Code Issues Projects Releases Wiki Activity

commands: Added error marshalling to Response

Browse Source
This commit is contained in:
Matt Bell
2014-10-10 13:59:40 -07:00
committed by Juan Batiz-Benet
parent 01938ac574
commit aa592cec80
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
commands/response.go
View File

@ -16,8 +16,8 @@ const (
// Error is a struct for marshalling errors
type Error struct {
message string
code ErrorType
Message string
Code ErrorType
}
type EncodingType string
@ -50,6 +50,10 @@ func (r *Response) FormatError() Error {
}
func (r *Response) Marshal() ([]byte, error) {
if r.Error == nil && r.Value == nil {
return nil, fmt.Errorf("No error or value set, there is nothing to marshal")
}
enc := r.req.Option("enc")
if enc == nil {
return nil, fmt.Errorf("No encoding type was specified")
@ -61,5 +65,10 @@ func (r *Response) Marshal() ([]byte, error) {
return nil, fmt.Errorf("No marshaller found for encoding type '%s'", enc)
}
return marshaller(r.Value)
if r.Error != nil {
err := r.FormatError()
return marshaller(err)
} else {
return marshaller(r.Value)
}
}