MoreThanText/morethantext
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made queue send return a result/

Browse Source
This commit is contained in:
Jeff Baskin
2025-04-09 08:40:23 -04:00
parent e16c0ed4ae
commit fbd8e81a6f
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/session.rs
View File

@ -46,19 +46,17 @@ impl Session {
fn validate(&mut self, msg: Message) {
match msg.get_data("sess_id") {
Some(sid) => {
match sid {
Field::Uuid(sess_id) => {
if self.data.contains_key(&sess_id) {
let mut reply = msg.reply(MsgType::Session);
reply.add_data("sess_id", sess_id.clone());
self.queue.send(reply);
} else {
self.new_session(msg);
}
},
_ => self.new_session(msg),
Some(sid) => match sid {
Field::Uuid(sess_id) => {
if self.data.contains_key(&sess_id) {
let mut reply = msg.reply(MsgType::Session);
reply.add_data("sess_id", sess_id.clone());
self.queue.send(reply).unwrap();
} else {
self.new_session(msg);
}
}
_ => self.new_session(msg),
},
None => self.new_session(msg),
}
@ -72,7 +70,7 @@ impl Session {
self.data.insert(id.clone(), SessionData {});
let mut reply = msg.reply(MsgType::Session);
reply.add_data("sess_id", id);
self.queue.send(reply);
self.queue.send(reply).unwrap();
}
}
@ -97,7 +95,7 @@ mod sessions {
let listen_for = [MsgType::Session];
let (queue, rx) = setup_session(listen_for.to_vec());
let msg = Message::new(MsgType::SessionValidate);
queue.send(msg.clone());
queue.send(msg.clone()).unwrap();
let result = rx.recv_timeout(TIMEOUT).unwrap();
match result.get_class() {
MsgType::Session => {}
@ -116,7 +114,7 @@ mod sessions {
let msg = Message::new(MsgType::SessionValidate);
let mut ids: Vec<Uuid> = Vec::new();
for _ in 0..10 {
queue.send(msg.clone());
queue.send(msg.clone()).unwrap();
let result = rx.recv_timeout(TIMEOUT).unwrap();
let id = result.get_data("sess_id").unwrap().to_uuid().unwrap();
assert!(!ids.contains(&id), "{} is a duplicate id", id);
@ -129,11 +127,11 @@ mod sessions {
let listen_for = [MsgType::Session];
let (queue, rx) = setup_session(listen_for.to_vec());
let mut msg = Message::new(MsgType::SessionValidate);
queue.send(msg.clone());
queue.send(msg.clone()).unwrap();
let holder = rx.recv_timeout(TIMEOUT).unwrap();
let id = holder.get_data("sess_id").unwrap().to_uuid().unwrap();
msg.add_data("sess_id", id.clone());
queue.send(msg);
queue.send(msg).unwrap();
let result = rx.recv_timeout(TIMEOUT).unwrap();
let output = result.get_data("sess_id").unwrap().to_uuid().unwrap();
assert_eq!(output, id);
@ -146,7 +144,7 @@ mod sessions {
let (queue, rx) = setup_session(listen_for.to_vec());
let mut msg = Message::new(MsgType::SessionValidate);
msg.add_data("sess_id", id.clone());
queue.send(msg);
queue.send(msg).unwrap();
let result = rx.recv_timeout(TIMEOUT).unwrap();
let output = result.get_data("sess_id").unwrap().to_uuid().unwrap();
assert_ne!(output, id);
@ -159,7 +157,7 @@ mod sessions {
let (queue, rx) = setup_session(listen_for.to_vec());
let mut msg = Message::new(MsgType::SessionValidate);
msg.add_data("sess_id", id);
queue.send(msg);
queue.send(msg).unwrap();
let result = rx.recv_timeout(TIMEOUT).unwrap();
let output = result.get_data("sess_id").unwrap().to_string();
assert_ne!(output, id);