Made queue send return a result/
This commit is contained in:
22
src/queue.rs
22
src/queue.rs
@ -181,15 +181,16 @@ impl Queue {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn send(&self, msg: Message) {
|
||||
pub fn send(&self, msg: Message) -> Result<(), String> {
|
||||
let store = self.store.read().unwrap();
|
||||
match store.get(&msg.get_class()) {
|
||||
Some(senders) => {
|
||||
for sender in senders.into_iter() {
|
||||
sender.send(msg.clone()).unwrap();
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
None => {}
|
||||
None => Err(format!("no listeners for {:?}", msg.get_class())),
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -211,7 +212,7 @@ mod queues {
|
||||
let (tx2, rx2) = channel();
|
||||
queue.add(tx1, [MsgType::SessionValidate].to_vec());
|
||||
queue.add(tx2, [MsgType::SessionValidate].to_vec());
|
||||
queue.send(Message::new(MsgType::SessionValidate));
|
||||
queue.send(Message::new(MsgType::SessionValidate)).unwrap();
|
||||
rx1.recv().unwrap();
|
||||
rx2.recv().unwrap();
|
||||
}
|
||||
@ -223,7 +224,7 @@ mod queues {
|
||||
let (tx2, rx2) = channel();
|
||||
queue.add(tx1, [MsgType::SessionValidate].to_vec());
|
||||
queue.add(tx2, [MsgType::Session].to_vec());
|
||||
queue.send(Message::new(MsgType::SessionValidate));
|
||||
queue.send(Message::new(MsgType::SessionValidate)).unwrap();
|
||||
let result = rx1.recv().unwrap();
|
||||
match result.get_class() {
|
||||
MsgType::SessionValidate => {}
|
||||
@ -239,7 +240,7 @@ mod queues {
|
||||
_ => unreachable!("{:?}", err),
|
||||
},
|
||||
}
|
||||
queue.send(Message::new(MsgType::Session));
|
||||
queue.send(Message::new(MsgType::Session)).unwrap();
|
||||
let result = rx2.recv().unwrap();
|
||||
match result.get_class() {
|
||||
MsgType::Session => {}
|
||||
@ -262,17 +263,20 @@ mod queues {
|
||||
let queue = Queue::new();
|
||||
let (tx, rx) = channel();
|
||||
queue.add(tx, [MsgType::Session, MsgType::SessionValidate].to_vec());
|
||||
queue.send(Message::new(MsgType::SessionValidate));
|
||||
queue.send(Message::new(MsgType::SessionValidate)).unwrap();
|
||||
let msg = rx.recv().unwrap();
|
||||
assert_eq!(msg.get_class(), &MsgType::SessionValidate);
|
||||
queue.send(Message::new(MsgType::Session));
|
||||
queue.send(Message::new(MsgType::Session)).unwrap();
|
||||
let msg = rx.recv().unwrap();
|
||||
assert_eq!(msg.get_class(), &MsgType::Session);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unassigned_message_should_not_panic() {
|
||||
fn unassigned_message_should_return_error() {
|
||||
let queue = Queue::new();
|
||||
queue.send(Message::new(MsgType::Session));
|
||||
match queue.send(Message::new(MsgType::Session)) {
|
||||
Ok(_) => unreachable!("should return error"),
|
||||
Err(_) => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user