Skip to content

Commit

Permalink
Report errors in output instead of panicking (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemalamidis-lh authored Mar 11, 2022
1 parent 7801edf commit c8696ef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
16 changes: 8 additions & 8 deletions pkg/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type result struct {
StatusCode int `json:"statusCode"`
Latency time.Duration `json:"latency"`
Request *request `json:"request"`
err error
ErrorMsg string `json:"error"`
}

func startClientWorkers(numWorkers int, requests <-chan *request, results chan<- *result, dryRun bool, timeout int) {
Expand All @@ -49,38 +49,38 @@ func doHttpRequest(client *http.Client, requests <-chan *request, results chan<-
latencyStart := time.Now()

if dryRun {
sendResult(req, &http.Response{}, latencyStart, results)
sendResult(req, &http.Response{}, latencyStart, "", results)
} else {
go func() {
httpReq, err := req.httpRequest()

if err != nil {
results <- &result{err: err}
sendResult(req, &http.Response{}, latencyStart, err.Error(), results)
return
}

resp, err := client.Do(httpReq)

if err != nil {
results <- &result{err: err}
sendResult(req, &http.Response{}, latencyStart, err.Error(), results)
return
}

_, err = io.ReadAll(resp.Body)
defer resp.Body.Close()

if err != nil {
results <- &result{err: err}
sendResult(req, &http.Response{}, latencyStart, err.Error(), results)
return
}

sendResult(req, resp, latencyStart, results)
sendResult(req, resp, latencyStart, "", results)
}()
}
}
}

func sendResult(req *request, resp *http.Response, latencyStart time.Time, results chan<- *result) {
func sendResult(req *request, resp *http.Response, latencyStart time.Time, err string, results chan<- *result) {
latency := time.Now().Sub(latencyStart)
results <- &result{StatusCode: resp.StatusCode, Latency: latency, Request: req}
results <- &result{StatusCode: resp.StatusCode, Latency: latency, Request: req, ErrorMsg: err}
}
4 changes: 0 additions & 4 deletions pkg/replay.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ func Replay(phasesStr string, silent, printStats, dryRun bool, timeout int) {
return
}

if result.err != nil {
panic(result.err)
}

stats.onResult(result)

jsonResult, err := json.Marshal(result)
Expand Down

0 comments on commit c8696ef

Please sign in to comment.