Renaming functions to make way for pulling from queue by usize id.
parent
0b01d7a550
commit
e265ad2877
16
src/main.rs
16
src/main.rs
|
@ -37,13 +37,13 @@ fn index(dumb_queue: &State<DumbQueue>) -> String {
|
|||
}
|
||||
|
||||
|
||||
#[get("/<id>")]
|
||||
fn get_by_id(id: &str, dumb_queue: &State<DumbQueue>) -> Result<String, Status> {
|
||||
#[get("/<name>")]
|
||||
fn get_by_name(name: &str, dumb_queue: &State<DumbQueue>) -> Result<String, Status> {
|
||||
|
||||
let queue_map = &dumb_queue.queue_map;
|
||||
let queues = &dumb_queue.queues;
|
||||
let map_reader = queue_map.read().unwrap();
|
||||
match map_reader.get(id) {
|
||||
match map_reader.get(name) {
|
||||
Some(i) => {
|
||||
let index = *i;
|
||||
drop(map_reader);
|
||||
|
@ -58,8 +58,8 @@ fn get_by_id(id: &str, dumb_queue: &State<DumbQueue>) -> Result<String, Status>
|
|||
}
|
||||
}
|
||||
|
||||
#[put("/<id>", data = "<input>")]
|
||||
fn put_by_id(id: &str, input: &str, dumb_queue: &State<DumbQueue>) {
|
||||
#[put("/<name>", data = "<input>")]
|
||||
fn put_by_name(name: &str, input: &str, dumb_queue: &State<DumbQueue>) {
|
||||
|
||||
let queue_map = &dumb_queue.queue_map;
|
||||
let queues = &dumb_queue.queues;
|
||||
|
@ -68,7 +68,7 @@ fn put_by_id(id: &str, input: &str, dumb_queue: &State<DumbQueue>) {
|
|||
|
||||
let map_read = queue_map.read().unwrap();
|
||||
|
||||
match map_read.get(&id.to_string()) {
|
||||
match map_read.get(&name.to_string()) {
|
||||
None => {
|
||||
let new_queue = RwLock::new(VecDeque::with_capacity(1024));
|
||||
let mut write = new_queue.write().unwrap();
|
||||
|
@ -90,7 +90,7 @@ fn put_by_id(id: &str, input: &str, dumb_queue: &State<DumbQueue>) {
|
|||
|
||||
if inserted {
|
||||
let mut write = queue_map.write().unwrap();
|
||||
write.insert(id.to_string(), inserted_index);
|
||||
write.insert(name.to_string(), inserted_index);
|
||||
drop(write);
|
||||
}
|
||||
}
|
||||
|
@ -101,5 +101,5 @@ fn rocket() -> _ {
|
|||
// let dumb_queue : DumbQueue = DumbQueue::new();
|
||||
rocket::build()
|
||||
.manage( DumbQueue::new())
|
||||
.mount("/", routes![index, put_by_id, get_by_id])
|
||||
.mount("/", routes![index, put_by_name, get_by_name])
|
||||
}
|
Loading…
Reference in New Issue