address stebalien's comments
License: MIT Signed-off-by: keks <keks@cryptoscope.co>
keks committed
Sep 18, 2018 at 15:21 UTC
74ec1a9aef55b570e97a48a76ab817ce1b7b317c
4 files changed
+9
-9
cmd/ipfs/daemon.go
+1
-1
@@ -188,7 +188,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
188
// Inject metrics before we do anything
189
err := mprome.Inject()
190
if err != nil {
191
- return fmt.Errorf("Injecting prometheus handler for metrics failed with message %s", err.Error())
191
+ log.Errorf("Injecting prometheus handler for metrics failed with message: %s\n", err.Error())
192
}
193
194
// let the user know we're going.
core/commands/files.go
+6
-3
@@ -112,7 +112,6 @@ var filesStatCmd = &cmds.Command{
112
113
_, err := statGetFormatOptions(req)
114
if err != nil {
115
- // REVIEW NOTE: We didn't return here before, was that correct?
115
return cmdkit.Errorf(cmdkit.ErrClient, err.Error())
116
}
117
@@ -725,7 +724,7 @@ stat' on the file or any of its ancestors.
724
cidVersionOption,
725
hashOption,
726
},
728
- Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error {
727
+ Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) (retErr error) {
728
path, err := checkPath(req.Arguments[0])
729
if err != nil {
730
return err
@@ -775,7 +774,11 @@ stat' on the file or any of its ancestors.
774
defer func() {
775
err := wfd.Close()
776
if err != nil {
778
- re.CloseWithError(cmdkit.Errorf(cmdkit.ErrNormal, err.Error()))
777
+ if retErr == nil {
778
+ retErr = err
779
+ } else {
780
+ log.Error("files: error closing file mfs file descriptor", err)
781
+ }
782
}
783
}()
784
core/commands/get.go
+1
-3
@@ -103,9 +103,7 @@ may also specify the level of compression by specifying '-l=<1-9>'.
103
104
outReader, ok := v.(io.Reader)
105
if !ok {
106
- // TODO or just return the error here?
107
- log.Error(e.New(e.TypeErr(outReader, v)))
108
- return nil
106
+ return e.New(e.TypeErr(outReader, v))
107
}
108
109
outPath := getOutPath(req)
core/commands/urlstore.go
+1
-2
@@ -107,11 +107,10 @@ time.
107
return err
108
}
109
110
- err = cmds.EmitOnce(res, &BlockStat{
110
+ return cmds.EmitOnce(res, &BlockStat{
111
Key: root.Cid().String(),
112
Size: int(hres.ContentLength),
113
})
114
- return err
114
},
115
Encoders: cmds.EncoderMap{
116
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, bs *BlockStat) error {