PASS!! Dirty version before clenanup
This commit is contained in:
parent
3b6b1e8398
commit
0f993095ae
1 changed files with 33 additions and 16 deletions
|
|
@ -43,23 +43,26 @@ async fn handle_request(mut socket: TcpStream) {
|
||||||
let mut reader = BufReader::new(read);
|
let mut reader = BufReader::new(read);
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
|
log::info!("Start a new loop!");
|
||||||
let bytes = reader.read_until(b'\n', &mut buf).await;
|
let bytes = reader.read_until(b'\n', &mut buf).await;
|
||||||
|
|
||||||
if let Ok(0) = bytes {
|
if let Ok(0) = bytes {
|
||||||
return;
|
log::info!("0 bytes sent");
|
||||||
}
|
|
||||||
|
|
||||||
if let Ok(1) = bytes {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let message: serde_json::Value = match serde_json::from_slice(&buf) {
|
let message: serde_json::Value = match serde_json::from_slice(&buf) {
|
||||||
Ok(m) => m,
|
Ok(m) => m,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
log::error!(
|
||||||
|
"Not a prober JSON message: {}",
|
||||||
|
e
|
||||||
|
);
|
||||||
let _ = write.write(&MAL_FORMAT.as_bytes()).await;
|
let _ = write.write(&MAL_FORMAT.as_bytes()).await;
|
||||||
let _ = write.write(&[b'\n']).await;
|
let _ = write.write(&[b'\n']).await;
|
||||||
let _ = write.flush().await;
|
let _ = write.flush().await;
|
||||||
return;
|
buf.clear();
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -71,16 +74,27 @@ async fn handle_request(mut socket: TcpStream) {
|
||||||
Ok(n) => n,
|
Ok(n) => n,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Not a valid number: {}", e);
|
log::error!("Not a valid number: {}", e);
|
||||||
if let Err(e) = write
|
let message = serde_json::to_string(&Response {
|
||||||
.write(&serde_json::to_string(&Response {method: IS_PRIME.to_owned(), prime: false}).unwrap().as_bytes())
|
method: IS_PRIME.to_owned(),
|
||||||
.await
|
prime: false,
|
||||||
{
|
})
|
||||||
log::error!("Error writing serialize step: {}", e);
|
.unwrap();
|
||||||
}
|
log::info!("Sending back response: {}", message);
|
||||||
return;
|
if let Err(e) = write.write(&message.as_bytes()).await {
|
||||||
|
log::error!("Error writing serialize step: {}", e);
|
||||||
|
}
|
||||||
|
if let Err(e) = write.write(&[b'\n']).await {
|
||||||
|
log::error!("Error writing: {}", e);
|
||||||
|
}
|
||||||
|
if let Err(e) = write.flush().await {
|
||||||
|
log::error!("Error flushing: {}", e);
|
||||||
|
}
|
||||||
|
buf.clear();
|
||||||
|
log::info!("After clearing buffer!");
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
log::info!("Number is valid!");
|
||||||
let res = Response {
|
let res = Response {
|
||||||
method: IS_PRIME.to_owned(),
|
method: IS_PRIME.to_owned(),
|
||||||
prime: is_prime(possible_prime),
|
prime: is_prime(possible_prime),
|
||||||
|
|
@ -100,19 +114,21 @@ async fn handle_request(mut socket: TcpStream) {
|
||||||
if let Err(e) = write.flush().await {
|
if let Err(e) = write.flush().await {
|
||||||
log::error!("Error flushing: {}", e);
|
log::error!("Error flushing: {}", e);
|
||||||
}
|
}
|
||||||
|
buf.clear();
|
||||||
} else {
|
} else {
|
||||||
log::error!("Method is not isPrime");
|
log::error!("Method is not isPrime");
|
||||||
if let Err(e) = write.write(&MAL_FORMAT.as_bytes()).await {
|
if let Err(e) = write.write(&MAL_FORMAT.as_bytes()).await {
|
||||||
log::error!("Write mal_format failed!");
|
log::error!("Write mal_format failed: {}", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Err(e) = write.write(&[b'\n']).await {
|
if let Err(e) = write.write(&[b'\n']).await {
|
||||||
log::error!("Error writing escape character!");
|
log::error!("Error writing escape character: {}", e);
|
||||||
}
|
}
|
||||||
if let Err(e) = write.flush().await {
|
if let Err(e) = write.flush().await {
|
||||||
log::error!("Error flushing socket!");
|
log::error!("Error flushing socket: {}", e);
|
||||||
}
|
}
|
||||||
log::info!("Wrote malformat response");
|
log::info!("Wrote malformat response");
|
||||||
|
buf.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
|
@ -122,6 +138,7 @@ async fn handle_request(mut socket: TcpStream) {
|
||||||
let _ = write.write(&MAL_FORMAT.as_bytes()).await;
|
let _ = write.write(&MAL_FORMAT.as_bytes()).await;
|
||||||
let _ = write.write(&[b'\n']).await;
|
let _ = write.write(&[b'\n']).await;
|
||||||
let _ = write.flush().await;
|
let _ = write.flush().await;
|
||||||
|
buf.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue