cmds2: handle error return codes

ipfs · Nov 13, 2014 · 949b087 · 949b087
1 parent 30de23c
commit 949b087
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/cmd/ipfs2/main.go b/cmd/ipfs2/main.go
@@ -150,6 +150,10 @@ func (i *cmdInvocation) Run() (output io.Reader, err error) {
 		return nil, err
 	}
 
+	if err := res.Error(); err != nil {
+		return nil, err
+	}
+
 	return res.Reader()
 }
 

diff --git a/commands/response.go b/commands/response.go
@@ -117,6 +117,11 @@ func (r *response) Marshal() ([]byte, error) {
 	}
 	encType := EncodingType(strings.ToLower(enc))
 
+	// Special case: if text encoding and an error, just print it out.
+	if encType == Text && r.Error() != nil {
+		return []byte(r.Error().Error()), nil
+	}
+
 	var marshaller Marshaller
 	if r.req.Command() != nil && r.req.Command().Marshallers != nil {
 		marshaller = r.req.Command().Marshallers[encType]