FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Add task name to scheduler error messages

Browse source
This commit is contained in:
silverpill 2022-06-21 16:17:30 +00:00
parent d8972a9286
commit 6172d309bc
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/scheduler.rs
View file

@ -1,6 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::time::Duration; use std::time::Duration;
use anyhow::Error;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use uuid::Uuid; use uuid::Uuid;
@ -10,7 +11,7 @@ use crate::ethereum::contracts::ContractSet;
use crate::ethereum::nft::process_nft_events; use crate::ethereum::nft::process_nft_events;
use crate::ethereum::subscriptions::check_subscriptions; use crate::ethereum::subscriptions::check_subscriptions;
#[derive(Eq, Hash, PartialEq)] #[derive(Debug, Eq, Hash, PartialEq)]
enum Task { enum Task {
NftMonitor, NftMonitor,
SubscriptionMonitor, SubscriptionMonitor,
@ -55,7 +56,7 @@ pub fn run(
if !is_task_ready(last_run, task.period()) { if !is_task_ready(last_run, task.period()) {
continue; continue;
}; };
match task { let task_result = match task {
Task::NftMonitor => { Task::NftMonitor => {
if let Some(contract_set) = maybe_contract_set.as_ref() { if let Some(contract_set) = maybe_contract_set.as_ref() {
// Monitor events only if ethereum integration is enabled // Monitor events only if ethereum integration is enabled
@ -65,10 +66,8 @@ pub fn run(
contract_set.current_block, contract_set.current_block,
&db_pool, &db_pool,
&mut token_waitlist_map, &mut token_waitlist_map,
).await.unwrap_or_else(|err| { ).await.map_err(Error::from)
log::error!("{}", err); } else { Ok(()) }
});
};
}, },
Task::SubscriptionMonitor => { Task::SubscriptionMonitor => {
if let Some(contract_set) = maybe_contract_set.as_ref() { if let Some(contract_set) = maybe_contract_set.as_ref() {
@ -77,12 +76,13 @@ pub fn run(
&contract_set.subscription, &contract_set.subscription,
contract_set.current_block, contract_set.current_block,
&db_pool, &db_pool,
).await.unwrap_or_else(|err| { ).await.map_err(Error::from)
log::error!("{}", err); } else { Ok(()) }
});
};
}, },
}; };
task_result.unwrap_or_else(|err| {
log::error!("{:?}: {}", task, err);
});
*last_run = Some(Utc::now()); *last_run = Some(Utc::now());
}; };
} }