From 002cf5128e699c6b17858d61156944c5d04aaa0a Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 19 May 2015 17:58:57 -0700
Subject: [PATCH] fix silent refs failure
---
cmd/ipfs/main.go | 7 +++-
core/commands/refs.go | 91 +++++++++++++++++++------------------------
2 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
index e34492ca8..af2734ab0 100644
--- a/cmd/ipfs/main.go
+++ b/cmd/ipfs/main.go
@@ -154,7 +154,12 @@ func main() {
}
// everything went better than expected :)
- io.Copy(os.Stdout, output)
+ _, err = io.Copy(os.Stdout, output)
+ if err != nil {
+ printErr(err)
+
+ os.Exit(1)
+ }
}
func (i *cmdInvocation) Run(ctx context.Context) (output io.Reader, err error) {
diff --git a/core/commands/refs.go b/core/commands/refs.go
index 80a08ae1d..1f101843b 100644
--- a/core/commands/refs.go
+++ b/core/commands/refs.go
@@ -2,9 +2,10 @@ package commands
import (
"bytes"
+ "errors"
+ "fmt"
"io"
"strings"
- "sync"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
cmds "github.com/ipfs/go-ipfs/commands"
@@ -91,14 +92,14 @@ Note: list all refs recursively with -r.
return
}
- piper, pipew := io.Pipe()
- eptr := &ErrPassThroughReader{R: piper}
+ out := make(chan interface{})
+ res.SetOutput((<-chan interface{})(out))
go func() {
- defer pipew.Close()
+ defer close(out)
rw := RefWriter{
- W: pipew,
+ out: out,
DAG: n.DAG,
Ctx: ctx,
Unique: unique,
@@ -109,14 +110,40 @@ Note: list all refs recursively with -r.
for _, o := range objs {
if _, err := rw.WriteRefs(o); err != nil {
- eptr.SetError(err)
+ out <- &RefWrapper{Err: err.Error()}
return
}
}
}()
+ },
+ Marshalers: cmds.MarshalerMap{
+ cmds.Text: func(res cmds.Response) (io.Reader, error) {
+ outChan, ok := res.Output().(<-chan interface{})
+ if !ok {
+ return nil, u.ErrCast()
+ }
- res.SetOutput(eptr)
+ marshal := func(v interface{}) (io.Reader, error) {
+ obj, ok := v.(*RefWrapper)
+ if !ok {
+ fmt.Println("%#v", v)
+ return nil, u.ErrCast()
+ }
+
+ if obj.Err != "" {
+ return nil, errors.New(obj.Err)
+ }
+
+ return strings.NewReader(obj.Ref), nil
+ }
+
+ return &cmds.ChannelMarshaler{
+ Channel: outChan,
+ Marshaler: marshal,
+ }, nil
+ },
},
+ Type: RefWrapper{},
}
var RefsLocalCmd = &cmds.Command{
@@ -143,7 +170,6 @@ Displays the hashes of all local objects.
}
piper, pipew := io.Pipe()
- eptr := &ErrPassThroughReader{R: piper}
go func() {
defer pipew.Close()
@@ -151,13 +177,13 @@ Displays the hashes of all local objects.
for k := range allKeys {
s := k.Pretty() + "\n"
if _, err := pipew.Write([]byte(s)); err != nil {
- eptr.SetError(err)
+ log.Error("pipe write error: ", err)
return
}
}
}()
- res.SetOutput(eptr)
+ res.SetOutput(piper)
},
}
@@ -173,46 +199,13 @@ func objectsForPaths(ctx context.Context, n *core.IpfsNode, paths []string) ([]*
return objects, nil
}
-// ErrPassThroughReader is a reader that may return an externally set error.
-type ErrPassThroughReader struct {
- R io.ReadCloser
- err error
-
- sync.RWMutex
-}
-
-func (r *ErrPassThroughReader) Error() error {
- r.RLock()
- defer r.RUnlock()
- return r.err
-}
-
-func (r *ErrPassThroughReader) SetError(err error) {
- r.Lock()
- r.err = err
- r.Unlock()
-}
-
-func (r *ErrPassThroughReader) Read(buf []byte) (int, error) {
- err := r.Error()
- if err != nil {
- return 0, err
- }
-
- return r.R.Read(buf)
-}
-
-func (r *ErrPassThroughReader) Close() error {
- err1 := r.R.Close()
- err2 := r.Error()
- if err2 != nil {
- return err2
- }
- return err1
+type RefWrapper struct {
+ Ref string
+ Err string
}
type RefWriter struct {
- W io.Writer
+ out chan interface{}
DAG dag.DAGService
Ctx context.Context
@@ -335,8 +328,6 @@ func (rw *RefWriter) WriteEdge(from, to u.Key, linkname string) error {
}
s += "\n"
- if _, err := rw.W.Write([]byte(s)); err != nil {
- return err
- }
+ rw.out <- &RefWrapper{Ref: s}
return nil
}
--
GitLab