fix error handling in core/commands/{add,get}.go
License: MIT Signed-off-by: keks <keks@cryptoscope.co>
keks committed
Dec 4, 2017 at 14:27 UTC
6f82f086116848b2f3acf79d573802683bc68cce
2 files changed
+3
-15
core/commands/add.go
+2
-13
@@ -453,19 +453,8 @@ You can now check what blocks have been created by:
453
454
for {
455
v, err := res.Next()
456
- if err != nil {
457
- // replace error by actual error - will be looked at by next if-statement
458
- if err == cmds.ErrRcvdError {
459
- err = res.Error()
460
- }
461
-
462
- if e, ok := err.(*cmdkit.Error); ok {
463
- re.Emit(e)
464
- } else if err != io.EOF {
465
- re.SetError(err, cmdkit.ErrNormal)
466
- }
467
-
468
- return
456
+ if !cmds.HandleError(err, res, re) {
457
+ break
458
}
459
460
select {
core/commands/get.go
+1
-2
@@ -109,8 +109,7 @@ may also specify the level of compression by specifying '-l=<1-9>'.
109
defer re.Close()
110
111
v, err := res.Next()
112
- if err != nil {
113
- log.Error(e.New(err))
112
+ if !cmds.HandleError(err, res, re) {
113
return
114
}
115