Don't close when finishing drawing (#55)

nakabonne · Oct 8, 2020 · 06cefb6 · 06cefb6
1 parent 2a36d9a
commit 06cefb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/attacker/attacker.go b/attacker/attacker.go
@@ -104,7 +104,6 @@ func Attack(ctx context.Context, target string, resCh chan *Result, metricsCh ch
  select {
  case <-ctx.Done():
  opts.Attacker.Stop()
- // metricsCh is already closed (as context is done) so we shouldn't send any metric
  return
  default:
  resCh <- &Result{Latency: res.Latency}

diff --git a/gui/drawer.go b/gui/drawer.go
@@ -101,7 +101,6 @@ End: %v`
 )
 
 func (d *drawer) redrawMetrics(ctx context.Context) {
- defer close(d.metricsCh)
  for {
  select {
  case <-ctx.Done():

diff --git a/gui/drawer_test.go b/gui/drawer_test.go
@@ -261,7 +261,10 @@ End: 2009-11-10T23:00:00Z`, gomock.Any())
  go d.redrawMetrics(ctx)
  d.metricsCh <- tt.metrics
  cancel()
- <-d.metricsCh
+ // TODO: Stop waiting inappropriately.
+ // Currently waiting in a rough manner to ensure that the mock function
+ // is called in the `redrawMetrics`, but it is unstable and inefficient.
+ time.Sleep(2 * time.Second)
  })
  }
 }