Skip to content

Commit

Permalink
When queue is full, requests hang because Wait.Done() is not cal… (#430)
Browse files Browse the repository at this point in the history
* if queue is full then mark notification as failed and unblock the wait group instead of hanging

* use WaitDone() function instead of calling Done() on notification wait group as it is safer
  • Loading branch information
SebastienMelki authored and appleboy committed Oct 17, 2019
1 parent 5179f32 commit 7c71629
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion gorush/worker.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gorush

import (
"errors"
"sync"
)

Expand Down Expand Up @@ -30,6 +31,15 @@ func startWorker() {
}
}

// markFailedNotification adds failure logs for all tokens in push notification
func markFailedNotification(notification *PushNotification, reason string) {
LogError.Error(reason)
for _, token := range notification.Tokens {
notification.AddLog(getLogPushEntry(FailedPush, token, *notification, errors.New(reason)))
}
notification.WaitDone()
}

// queueNotification add notification to queue list.
func queueNotification(req RequestPush) (int, []LogPushEntry) {
var count int
Expand Down Expand Up @@ -58,7 +68,7 @@ func queueNotification(req RequestPush) (int, []LogPushEntry) {
notification.AddWaitCount()
}
if !tryEnqueue(*notification, QueueNotification) {
LogError.Error("max capacity reached")
markFailedNotification(notification, "max capacity reached")
}
count += len(notification.Tokens)
// Count topic message
Expand Down

0 comments on commit 7c71629

Please sign in to comment.