Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1135 from mozilla-services/feat/issue-1133
Browse files Browse the repository at this point in the history
feat: drain pending notifications from the client rx queue
  • Loading branch information
jrconlin authored Feb 14, 2018
2 parents 976b03c + 09a985a commit a24d741
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions autopush_rs/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ where

pub fn shutdown(&mut self) {
// If we made it past hello, do more cleanup
let webpush = match self.webpush.take() {
let mut webpush = match self.webpush.take() {
Some(webpush) => webpush,
None => return
};
Expand All @@ -730,10 +730,24 @@ where
.send()
.ok();

// If there's any notifications in the queue, move them to our unacked direct notifs
webpush.rx.close();
// wait() is ok as the queue is closed at this point.
let rx_iter = webpush.rx.wait();
for msg in rx_iter {
match msg {
Ok(ServerNotification::CheckStorage) => continue,
Ok(ServerNotification::Notification(notif)) => {
webpush.unacked_direct_notifs.push(notif);
}
Err(_) => continue,
}
}

// If there's direct unack'd messages, they need to be saved out without blocking
// here
self.srv.disconnet_client(&webpush.uaid);
let mut stats = webpush.stats.clone();
let mut stats = webpush.stats;
let unacked_direct_notifs = webpush.unacked_direct_notifs.len();
if unacked_direct_notifs > 0 {
stats.direct_storage += unacked_direct_notifs as i32;
Expand Down

0 comments on commit a24d741

Please sign in to comment.