get rid of pesky type alias

This commit is contained in:
Brandon Thomas committed 2026-03-25 16:38:56 -04:00
1 parent d80c3fdfe7
commit 930d705217
4 files changed
+11 -13

No files matched your search

+3 -3
View File
@@ -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<SharedMessageQueue>,
queue: Option<Arc<PagerWorkerMessageQueue>>,
worker: Option<PagerWorkerThread>,
worker_shutdown: Option<Arc<AtomicBool>>,
}
@@ -30,7 +30,7 @@ impl Pager {
/// External users will need to create instances via `PagerBuilder`.
pub(crate) fn new(
client: PagerClient,
queue: Option<SharedMessageQueue>,
queue: Option<Arc<PagerWorkerMessageQueue>>,
worker: Option<PagerWorkerThread>,
worker_shutdown: Option<Arc<AtomicBool>>,
) -> Self {
+3 -2
View File
@@ -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<PagerWorkerMessageQueue> = match self.queue_capacity {
Some(capacity) => new_shared_queue_with_capacity(capacity),
None => new_shared_queue(),
};
@@ -95,13 +95,10 @@ impl PagerWorkerMessageQueue {
}
}
/// Shareable handle to a message queue.
pub type SharedMessageQueue = Arc<PagerWorkerMessageQueue>;
pub fn new_shared_queue() -> SharedMessageQueue {
pub fn new_shared_queue() -> Arc<PagerWorkerMessageQueue> {
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<PagerWorkerMessageQueue> {
Arc::new(PagerWorkerMessageQueue::with_capacity(max_size))
}
@@ -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<PagerWorkerMessageQueue>,
client: PagerClient,
shutdown: Arc<AtomicBool>,
}
impl PagerWorkerThread {
pub fn new(
queue: SharedMessageQueue,
queue: Arc<PagerWorkerMessageQueue>,
client: PagerClient,
) -> Self {
Self {