From 61d0dc1f3ef62502ab2fafa8d10cc86070fb47ce Mon Sep 17 00:00:00 2001
From: Kristina Spring <kmspring57@gmail.com>
Date: Wed, 13 May 2020 13:58:26 -0700
Subject: [PATCH] removed queueEmpty variable from outbound sender

---
 CHANGELOG.md      | 1 +
 outboundSender.go | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0187b4c3..c854a559 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 - cleaned up shutdown logic for outbound sender [#205](https://github.com/xmidt-org/caduceus/pull/205)
 - added resetting queue depth and current workers gauges to outbound sender [#205](https://github.com/xmidt-org/caduceus/pull/205)
+- removed queueEmpty variable from outbound sender [#209](https://github.com/xmidt-org/caduceus/pull/209)
 
 ## [v0.2.7]
 - pared down logging, especially debugging logs [#196](https://github.com/xmidt-org/caduceus/pull/196)
diff --git a/outboundSender.go b/outboundSender.go
index d7fb34f8..2062fa3d 100644
--- a/outboundSender.go
+++ b/outboundSender.go
@@ -154,7 +154,6 @@ type CaduceusOutboundSender struct {
 	failureMsg                       FailureMessage
 	logger                           log.Logger
 	mutex                            sync.RWMutex
-	queueEmpty                       bool
 	queue                            atomic.Value
 }
 
@@ -197,7 +196,6 @@ func (osf OutboundSenderFactory) New() (obs OutboundSender, err error) {
 			QueueSize:    osf.QueueSize,
 			Workers:      osf.NumWorkers,
 		},
-		queueEmpty: true,
 	}
 
 	// Don't share the secret with others when there is an error.
@@ -427,7 +425,7 @@ func (obs *CaduceusOutboundSender) Queue(msg *wrp.Message) {
 }
 
 func (obs *CaduceusOutboundSender) isValidTimeWindow(now, dropUntil, deliverUntil time.Time) bool {
-	if false == now.After(dropUntil) || !obs.queueEmpty {
+	if false == now.After(dropUntil) {
 		// client was cut off
 		obs.droppedCutoffCounter.Add(1.0)
 		return false
@@ -447,8 +445,6 @@ func (obs *CaduceusOutboundSender) Empty(droppedCounter metrics.Counter) {
 	obs.queue.Store(make(chan *wrp.Message, obs.queueSize))
 	droppedCounter.Add(float64(len(droppedMsgs)))
 	obs.queueDepthGauge.Set(0.0)
-	obs.queueEmpty = true
-
 	return
 }
 
@@ -620,7 +616,6 @@ func (obs *CaduceusOutboundSender) queueOverflow() {
 		obs.mutex.Unlock()
 		return
 	}
-	obs.queueEmpty = false
 	obs.dropUntil = time.Now().Add(obs.cutOffPeriod)
 	obs.dropUntilGauge.Set(float64(obs.dropUntil.Unix()))
 	secret := obs.listener.Config.Secret