Skip to content

Fix retry count #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rahuljayaraman wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix retry count #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f463ed8
update gitignore
rahuljayaraman Apr 24, 2018
5b58974
allow setting max retries for a message
rahuljayaraman Apr 25, 2018
d98c3f5
Revert "update gitignore"
rahuljayaraman Apr 25, 2018
4399e06
initialize retry_count to 0
rahuljayaraman Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions enqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,28 @@ type EnqueueData struct {
EnqueueOptions
}

type EnqueueDataProxy EnqueueData

func (e EnqueueData) MarshalJSON() ([]byte, error) {
o := e.EnqueueOptions
if e.EnqueueOptions.RetryCount > 0 {
s := struct {
EnqueueDataProxy
Retry int `json:"retry,omitempty"`
RetryCount int `json:"retry_count"`
At float64 `json:"at,omitempty"`
}{EnqueueDataProxy(e), o.RetryCount, 0, o.At}
return json.Marshal(s)
}

return json.Marshal(struct {
EnqueueDataProxy
RetryCount int `json:"retry_count,omitempty"`
Retry bool `json:"retry,omitempty"`
At float64 `json:"at,omitempty"`
}{EnqueueDataProxy(e), o.RetryCount, o.Retry, o.At})
}

type EnqueueOptions struct {
RetryCount int `json:"retry_count,omitempty"`
Retry bool `json:"retry,omitempty"`
Expand Down
22 changes: 17 additions & 5 deletions enqueue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,23 @@ func EnqueueSpec(c gospec.Context) {
c.Expect(ea, IsWithin(0.1), nowToSecondsWithNanoPrecision())
})

c.Specify("has retry and retry_count when set", func() {
EnqueueWithOptions("enqueue6", "Compare", []string{"foo", "bar"}, EnqueueOptions{RetryCount: 13, Retry: true})
c.Specify("sets retry count to `retry`", func() {
EnqueueWithOptions("enqueue6", "Compare", []string{"foo", "bar"}, EnqueueOptions{RetryCount: 13})

bytes, _ := redis.Bytes(conn.Do("lpop", "prod:queue:enqueue6"))
var result map[string]interface{}
json.Unmarshal(bytes, &result)
c.Expect(result["class"], Equals, "Compare")

retry := result["retry"].(float64)
c.Expect(retry, Equals, float64(13))

retryCount := result["retry_count"].(float64)
c.Expect(retryCount, Equals, float64(0))
})

c.Specify("sets Retry correctly when no count given", func() {
EnqueueWithOptions("enqueue6", "Compare", []string{"foo", "bar"}, EnqueueOptions{Retry: true})

bytes, _ := redis.Bytes(conn.Do("lpop", "prod:queue:enqueue6"))
var result map[string]interface{}
Expand All @@ -82,9 +97,6 @@ func EnqueueSpec(c gospec.Context) {

retry := result["retry"].(bool)
c.Expect(retry, Equals, true)

retryCount := int(result["retry_count"].(float64))
c.Expect(retryCount, Equals, 13)
})
})

Expand Down