mirror of
https://git.asonix.dog/asonix/background-jobs.git
synced 2024-11-21 19:40:59 +00:00
Properly fetch jobs for memory storage
This commit is contained in:
parent
007d53b3c5
commit
3144b71abb
1 changed files with 9 additions and 3 deletions
|
@ -135,6 +135,7 @@ pub trait Storage: Clone + Send {
|
|||
/// A default, in-memory implementation of a storage mechanism
|
||||
pub mod memory_storage {
|
||||
use super::{JobInfo, Stats};
|
||||
use chrono::Utc;
|
||||
use futures::lock::Mutex;
|
||||
use std::{collections::HashMap, convert::Infallible, sync::Arc};
|
||||
|
||||
|
@ -195,16 +196,21 @@ pub mod memory_storage {
|
|||
|
||||
async fn fetch_job_from_queue(&self, queue: &str) -> Result<Option<JobInfo>, Self::Error> {
|
||||
let mut inner = self.inner.lock().await;
|
||||
let now = Utc::now();
|
||||
|
||||
let j = inner
|
||||
.queues
|
||||
.iter()
|
||||
.filter_map(|(k, v)| {
|
||||
if v == queue {
|
||||
inner.jobs.get(k).map(|j| j.clone())
|
||||
} else {
|
||||
None
|
||||
let job = inner.jobs.get(k)?;
|
||||
|
||||
if job.is_pending(now) && job.is_ready(now) && job.is_in_queue(queue) {
|
||||
return Some(job.clone());
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
})
|
||||
.next();
|
||||
|
||||
|
|
Loading…
Reference in a new issue