Skip to content
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

fix: fix debouncer delay bug #3376

Merged
merged 2 commits into from
Sep 22, 2021
Merged

fix: fix debouncer delay bug #3376

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fa32b4
Fix debouncer delay bug
hansieodendaal Sep 22, 2021
6846508
Merge branch 'development' into ho_fix_debouncer_delay_bug
aviator-app[bot] Sep 22, 2021
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
17 changes: 9 additions & 8 deletions applications/tari_console_wallet/src/ui/state/debouncer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use tari_wallet::output_manager_service::handle::OutputManagerHandle;
use tokio::{
sync::{broadcast, RwLock},
time,
time::MissedTickBehavior,
};

const LOG_TARGET: &str = "wallet::console_wallet::debouncer";
Expand Down Expand Up @@ -61,8 +62,9 @@ impl BalanceEnquiryDebouncer {
pub async fn run(mut self) {
let balance_enquiry_events = &mut self.tx.subscribe();
let mut shutdown_signal = self.app_state_inner.read().await.get_shutdown_signal();
let delay = time::sleep(self.balance_enquiry_cooldown_period);
tokio::pin!(delay);
let mut interval = time::interval(self.balance_enquiry_cooldown_period);
interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
tokio::pin!(interval);

debug!(target: LOG_TARGET, "Balance enquiry debouncer starting");
if let Ok(balance) = self.output_manager_service.get_balance().await {
Expand All @@ -80,13 +82,16 @@ impl BalanceEnquiryDebouncer {
}
loop {
tokio::select! {
_ = &mut delay => {
_ = interval.tick() => {
if let Ok(result) = time::timeout(
self.balance_enquiry_cooldown_period,
balance_enquiry_events.recv()
).await {
if let Err(broadcast::error::RecvError::Lagged(n)) = result {
trace!(target: LOG_TARGET, "Balance enquiry debouncer lagged {} update requests", n);
}
match result {
Ok(_) => {
Ok(_) | Err(broadcast::error::RecvError::Lagged(_)) => {
let start_time = Instant::now();
match self.output_manager_service.get_balance().await {
Ok(balance) => {
Expand All @@ -108,10 +113,6 @@ impl BalanceEnquiryDebouncer {
}
}
}
Err(broadcast::error::RecvError::Lagged(n)) => {
trace!(target: LOG_TARGET, "Balance enquiry debouncer lagged {} update requests", n);
continue;
}
Err(broadcast::error::RecvError::Closed) => {
info!(
target: LOG_TARGET,
Expand Down