Merge pull request #114 from jim-slattery-rs/master

fixed Queue.Poll() timout bug, Put() would get stuck on leftover sema

Author: dustinhiatt-wf

queue/queue.go

@@ -222,6 +222,14 @@ func (q *Queue) Poll(number int64, timeout time.Duration) ([]interface{}, error)
 			sema.response.Done()
 			return items, nil
 		case <-timeoutC:
+			// cleanup the sema that was added to waiters
+			select {
+			case sema.ready <- true:
+				// we called this before Put() could
+			default:
+				// Put() got it already, we need to call Done() so Put() can move on
+				sema.response.Done()
+			}
 			return nil, ErrTimeout
 		}
 	}

queue/queue_test.go

@@ -85,6 +85,9 @@ func TestGet(t *testing.T) {
 func TestPoll(t *testing.T) {
 	q := New(10)
 
+	// should be able to Poll() before anything is present, without breaking future Puts
+	q.Poll(1, time.Millisecond)
+
 	q.Put(`test`)
 	result, err := q.Poll(2, 0)
 	if !assert.Nil(t, err) {