Skip to content

Commit

Permalink
fix clippy and typos error
Browse files Browse the repository at this point in the history
  • Loading branch information
marverlous811 committed Aug 20, 2024
1 parent 1f98f0d commit a66ce4f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 16 deletions.
2 changes: 0 additions & 2 deletions bin/src/server/connector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ pub async fn run_media_connector(workers: usize, node: NodeConfig, args: Args) {
loop {
select! {

Check warning on line 158 in bin/src/server/connector.rs

View check run for this annotation

Codecov / codecov/patch

bin/src/server/connector.rs#L155-L158

Added lines #L155 - L158 were not covered by tests
Some((from, ts, _req_id, req)) = connector_hook_rx.recv() => {
log::error!("[MediaConnector] hook event {:?}", req);
hook_controller.on_event(from, ts, req);
}
_ = interval.tick() => {
Expand Down Expand Up @@ -198,7 +197,6 @@ pub async fn run_media_connector(workers: usize, node: NodeConfig, args: Args) {
SdnExtOut::ServicesEvent(_, _, SE::Connector(event)) => match event {
media_server_connector::handler_service::Event::Req(from, ts, req_id, event) => {
let ev = event.clone();

Check warning on line 199 in bin/src/server/connector.rs

View check run for this annotation

Codecov / codecov/patch

bin/src/server/connector.rs#L199

Added line #L199 was not covered by tests
log::error!("[MediaConnector] hook event {:?}", ev);
if let Err(e) = connector_storage_tx.send((from, ts, req_id, event)).await {
log::error!("[MediaConnector] send event to storage error {:?}", e);
}
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/features/third-party-system-hook.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Message will sent to another system by using JSON format, defined here:
uuid: string,
node: number,
ts: number,
event: 'session' | 'peer' | 'remote_track' | 'loacl_track',
event: 'session' | 'peer' | 'remote_track' | 'local_track',
payload: JSON
}
```
Expand Down
8 changes: 3 additions & 5 deletions packages/media_connector/src/hooks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pub mod events;
pub mod storage;
pub mod worker;

use std::{io::Error, sync::Arc};
use std::{io::Error, rc::Rc, sync::Arc};

use async_trait::async_trait;
use atm0s_sdn::NodeId;
Expand All @@ -27,7 +27,7 @@ pub struct HookControllerCfg {
pub struct ConnectorHookController {
cfg: HookControllerCfg,
workers: Vec<HookWorker>,
storage: Arc<dyn HookStorage>,
storage: Rc<dyn HookStorage>,
}

impl ConnectorHookController {
Expand All @@ -39,7 +39,7 @@ impl ConnectorHookController {
Self {
cfg,
workers,
storage: Arc::new(storage::InMemoryHookStorage::default()),
storage: Rc::new(storage::InMemoryHookStorage::default()),
}
}

Check warning on line 44 in packages/media_connector/src/hooks.rs

View check run for this annotation

Codecov / codecov/patch

packages/media_connector/src/hooks.rs#L34-L44

Added lines #L34 - L44 were not covered by tests

Expand Down Expand Up @@ -212,14 +212,12 @@ impl ConnectorHookController {
}

Check warning on line 212 in packages/media_connector/src/hooks.rs

View check run for this annotation

Codecov / codecov/patch

packages/media_connector/src/hooks.rs#L207-L212

Added lines #L207 - L212 were not covered by tests

pub async fn on_tick(&mut self) {
// log::error!("on_tick: on worker ticks");
for worker in self.workers.iter_mut() {
worker.on_tick().await;

Check warning on line 216 in packages/media_connector/src/hooks.rs

View check run for this annotation

Codecov / codecov/patch

packages/media_connector/src/hooks.rs#L214-L216

Added lines #L214 - L216 were not covered by tests
}

let jobs = self.storage.jobs(self.cfg.job_num as i16);
for job in jobs.iter() {
// log::error!("job: {:?}", job.payload);
let path = job.payload.session() % (self.cfg.worker_num as u64);
self.workers[path as usize].push(job.clone());
}

Check warning on line 223 in packages/media_connector/src/hooks.rs

View check run for this annotation

Codecov / codecov/patch

packages/media_connector/src/hooks.rs#L219-L223

Added lines #L219 - L223 were not covered by tests
Expand Down
17 changes: 9 additions & 8 deletions packages/media_connector/src/hooks/storage.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::sync::{Arc, RwLock};
use std::{rc::Rc, sync::RwLock};

use media_server_utils::now_ms;

Expand All @@ -8,7 +8,7 @@ use super::events::HookEvent;
pub struct HookJobData {
pub payload: HookEvent,
pub ts: u64,
on_done: Arc<dyn Fn(String)>,
on_done: Rc<dyn Fn(String)>,
}

impl HookJobData {
Expand All @@ -23,18 +23,19 @@ pub trait HookStorage {
fn clean_timeout_event(&self, now: u64);
}

#[derive(Default)]
pub struct InMemoryHookStorage {
queue: Arc<RwLock<Vec<HookJobData>>>,
queue: Rc<RwLock<Vec<HookJobData>>>,
}

impl InMemoryHookStorage {
pub fn default() -> Self {
Self { queue: Default::default() }
}

pub fn len(&self) -> usize {
self.queue.read().unwrap().len()
}

pub fn is_empty(&self) -> bool {
self.queue.read().unwrap().is_empty()
}

Check warning on line 38 in packages/media_connector/src/hooks/storage.rs

View check run for this annotation

Codecov / codecov/patch

packages/media_connector/src/hooks/storage.rs#L36-L38

Added lines #L36 - L38 were not covered by tests
}

impl HookStorage for InMemoryHookStorage {
Expand All @@ -44,7 +45,7 @@ impl HookStorage for InMemoryHookStorage {
let mut queue = cloned_queue.write().unwrap();
queue.retain(|job| job.payload.id() != uuid.as_str());
};
let ack = Arc::new(ack);
let ack = Rc::new(ack);
let mut queue = self.queue.write().unwrap();
queue.push(HookJobData {
payload: data,
Expand Down

0 comments on commit a66ce4f

Please sign in to comment.