summaryrefslogtreecommitdiff
path: root/input
diff options
context:
space:
mode:
authorSilvan Jegen <s.jegen@gmail.com>2017-02-19 18:16:51 +0100
committerSilvan Jegen <s.jegen@gmail.com>2017-02-19 18:16:51 +0100
commitb1b366ac99c06cedff8f0ffc808649f27fa98c42 (patch)
treec9b22b3e1616384ace12bcf2d134027739fab847 /input
parentf1eb4962060267458883f86bb5f4093b9b1afc47 (diff)
Use a setter to set the Work error
Diffstat (limited to 'input')
-rw-r--r--input/http/http.go5
-rw-r--r--input/stdin/stdin.go7
2 files changed, 10 insertions, 2 deletions
diff --git a/input/http/http.go b/input/http/http.go
index 87ec0f9..61e2c39 100644
--- a/input/http/http.go
+++ b/input/http/http.go
@@ -50,10 +50,13 @@ func (hi *HTTPInput) httphandler(w http.ResponseWriter, r *http.Request) {
return
}
all, err := ioutil.ReadAll(r.Body)
+ wrk := &work.Work{Data: all}
if err != nil {
fmt.Printf("Error when reading HTTP request body: %q\n", err)
+ wrk.SetError(err)
}
- hi.retchan <- &work.Work{Data: all, Err: err}
+
+ hi.retchan <- wrk
}
func (hi *HTTPInput) Start() chan *work.Work {
diff --git a/input/stdin/stdin.go b/input/stdin/stdin.go
index 394b952..4421741 100644
--- a/input/stdin/stdin.go
+++ b/input/stdin/stdin.go
@@ -33,10 +33,15 @@ func (i *StdinInput) Start() chan *work.Work {
if err == io.EOF {
break
}
+
+ w := &work.Work{Data: bs}
+
if err != nil {
fmt.Printf("Error when reading input from Stdin: %q", err)
+ w.SetError(err)
}
- i.retchan <- &work.Work{Data: bs, Err: err}
+
+ i.retchan <- w
}
close(i.retchan)
}()