diff --git a/crates/lib/pager/src/client/pager.rs b/crates/lib/pager/src/client/pager.rs index 468c102ea5..5abd186bca 100644 --- a/crates/lib/pager/src/client/pager.rs +++ b/crates/lib/pager/src/client/pager.rs @@ -7,7 +7,7 @@ use crate::client::pager_client::{PageSentResult, PagerClient}; use crate::error::pager_error::PagerError; use crate::error::pager_service_error::PagerServiceError; use crate::notification::notification_details::NotificationDetails; -use crate::worker::pager_worker_message_queue::SharedMessageQueue; +use crate::worker::pager_worker_message_queue::PagerWorkerMessageQueue; use crate::worker::pager_worker_thread::PagerWorkerThread; /// The main programmer interface to the pager system. @@ -20,7 +20,7 @@ use crate::worker::pager_worker_thread::PagerWorkerThread; /// pub struct Pager { client: PagerClient, - queue: Option, + queue: Option>, worker: Option, worker_shutdown: Option>, } @@ -30,7 +30,7 @@ impl Pager { /// External users will need to create instances via `PagerBuilder`. pub(crate) fn new( client: PagerClient, - queue: Option, + queue: Option>, worker: Option, worker_shutdown: Option>, ) -> Self { diff --git a/crates/lib/pager/src/client/pager_builder.rs b/crates/lib/pager/src/client/pager_builder.rs index 6d4764d024..1bb259b4c2 100644 --- a/crates/lib/pager/src/client/pager_builder.rs +++ b/crates/lib/pager/src/client/pager_builder.rs @@ -4,7 +4,8 @@ use crate::client::pager::Pager; use crate::client::pager_client::{PagerClient, PagerClientConfig}; use crate::error::pager_client_error::PagerClientError; use crate::error::pager_error::PagerError; -use crate::worker::pager_worker_message_queue::{new_shared_queue, new_shared_queue_with_capacity, SharedMessageQueue}; +use std::sync::Arc; +use crate::worker::pager_worker_message_queue::{new_shared_queue, new_shared_queue_with_capacity, PagerWorkerMessageQueue}; use crate::worker::pager_worker_thread::PagerWorkerThread; /// Builder for constructing a `Pager` instance. @@ -80,7 +81,7 @@ impl PagerBuilder { let client = PagerClient::new(client_config, self.application_name, self.environment); let (queue, worker, worker_shutdown) = if self.enable_worker { - let queue: SharedMessageQueue = match self.queue_capacity { + let queue: Arc = match self.queue_capacity { Some(capacity) => new_shared_queue_with_capacity(capacity), None => new_shared_queue(), }; diff --git a/crates/lib/pager/src/worker/pager_worker_message_queue.rs b/crates/lib/pager/src/worker/pager_worker_message_queue.rs index 8a4f45a4c7..dd721aa444 100644 --- a/crates/lib/pager/src/worker/pager_worker_message_queue.rs +++ b/crates/lib/pager/src/worker/pager_worker_message_queue.rs @@ -95,13 +95,10 @@ impl PagerWorkerMessageQueue { } } -/// Shareable handle to a message queue. -pub type SharedMessageQueue = Arc; - -pub fn new_shared_queue() -> SharedMessageQueue { +pub fn new_shared_queue() -> Arc { Arc::new(PagerWorkerMessageQueue::new()) } -pub fn new_shared_queue_with_capacity(max_size: usize) -> SharedMessageQueue { +pub fn new_shared_queue_with_capacity(max_size: usize) -> Arc { Arc::new(PagerWorkerMessageQueue::with_capacity(max_size)) } diff --git a/crates/lib/pager/src/worker/pager_worker_thread.rs b/crates/lib/pager/src/worker/pager_worker_thread.rs index dd90f255b8..3cf2ba02b0 100644 --- a/crates/lib/pager/src/worker/pager_worker_thread.rs +++ b/crates/lib/pager/src/worker/pager_worker_thread.rs @@ -5,18 +5,18 @@ use std::time::Duration; use log::{error, info, warn}; use crate::client::pager_client::PagerClient; -use crate::worker::pager_worker_message_queue::SharedMessageQueue; +use crate::worker::pager_worker_message_queue::PagerWorkerMessageQueue; /// A background worker thread that consumes a message queue and sends pages. pub struct PagerWorkerThread { - queue: SharedMessageQueue, + queue: Arc, client: PagerClient, shutdown: Arc, } impl PagerWorkerThread { pub fn new( - queue: SharedMessageQueue, + queue: Arc, client: PagerClient, ) -> Self { Self {