Simplifying retryer now that workqueue is used across output loads

elastic · Apr 20, 2020 · 041922b · 041922b
1 parent a59a56e
commit 041922b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/libbeat/publisher/pipeline/controller.go b/libbeat/publisher/pipeline/controller.go
@@ -121,7 +121,6 @@ func (c *outputController) Set(outGrp outputs.Group) {
  c.retryer.sigOutputRemoved()
  }
  }
- c.retryer.updOutput(c.workQueue)
  for range clients {
  c.retryer.sigOutputAdded()
  }

diff --git a/libbeat/publisher/pipeline/retry.go b/libbeat/publisher/pipeline/retry.go
@@ -112,13 +112,6 @@ func (r *retryer) sigOutputRemoved() {
  r.sig <- retryerSignal{tag: sigRetryerOutputRemoved}
 }
 
-func (r *retryer) updOutput(ch workQueue) {
- r.sig <- retryerSignal{
- tag: sigRetryerUpdateOutput,
- channel: ch,
- }
-}
-
 func (r *retryer) retry(b Batch) {
  r.in <- batchEvent{tag: retryBatch, batch: b}
 }
@@ -212,8 +205,6 @@ func (r *retryer) loop() {
 
  case sig := <-r.sig:
  switch sig.tag {
- case sigRetryerUpdateOutput:
- r.out = sig.channel
  case sigRetryerOutputAdded:
  numOutputs++
  case sigRetryerOutputRemoved: