Added logs, optimize
This commit is contained in:
parent
100e020585
commit
f99ee4c64d
1 changed files with 10 additions and 6 deletions
|
|
@ -54,18 +54,18 @@ async fn handle_request(mut socket: TcpStream) {
|
||||||
|
|
||||||
match validate_request(buf.clone()) {
|
match validate_request(buf.clone()) {
|
||||||
Ok(m) => {
|
Ok(m) => {
|
||||||
|
log::info!("Valid request");
|
||||||
let _ = write.write(&m.as_bytes()).await;
|
let _ = write.write(&m.as_bytes()).await;
|
||||||
let _ = write.write(&[b'\n']).await;
|
|
||||||
let _ = buf.clear();
|
|
||||||
buf.clear();
|
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
|
log::error!("Not valid request");
|
||||||
let _ = write.write(&MAL_FORMAT.as_bytes()).await;
|
let _ = write.write(&MAL_FORMAT.as_bytes()).await;
|
||||||
let _ = write.write(&[b'\n']).await;
|
|
||||||
let _ = write.flush().await;
|
|
||||||
buf.clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let _ = write.write(&[b'\n']).await;
|
||||||
|
let _ = write.flush().await;
|
||||||
|
buf.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -75,6 +75,7 @@ fn validate_request(message: Vec<u8>) -> Result<String, std::io::Error> {
|
||||||
let possible_prime = match m.number.to_string().parse::<u64>() {
|
let possible_prime = match m.number.to_string().parse::<u64>() {
|
||||||
Ok(n) => n,
|
Ok(n) => n,
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
|
log::error!("Not a valid number for a prime candidate: {}", m.number);
|
||||||
return Ok(serde_json::to_string(&Response {
|
return Ok(serde_json::to_string(&Response {
|
||||||
method: IS_PRIME.to_owned(),
|
method: IS_PRIME.to_owned(),
|
||||||
prime: false,
|
prime: false,
|
||||||
|
|
@ -84,12 +85,14 @@ fn validate_request(message: Vec<u8>) -> Result<String, std::io::Error> {
|
||||||
};
|
};
|
||||||
|
|
||||||
if m.method == IS_PRIME.to_owned() {
|
if m.method == IS_PRIME.to_owned() {
|
||||||
|
log::info!("Method isPrime and possible prime number");
|
||||||
return Ok(serde_json::to_string(&Response {
|
return Ok(serde_json::to_string(&Response {
|
||||||
method: IS_PRIME.to_owned(),
|
method: IS_PRIME.to_owned(),
|
||||||
prime: is_prime(possible_prime),
|
prime: is_prime(possible_prime),
|
||||||
})
|
})
|
||||||
.unwrap());
|
.unwrap());
|
||||||
} else {
|
} else {
|
||||||
|
log::error!("Method is not isPrime");
|
||||||
return Err(std::io::Error::new(
|
return Err(std::io::Error::new(
|
||||||
ErrorKind::InvalidInput,
|
ErrorKind::InvalidInput,
|
||||||
"Method is not isPrime",
|
"Method is not isPrime",
|
||||||
|
|
@ -97,6 +100,7 @@ fn validate_request(message: Vec<u8>) -> Result<String, std::io::Error> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
|
log::error!("Message is not a valid JSON or Request type");
|
||||||
return Err(std::io::Error::new(
|
return Err(std::io::Error::new(
|
||||||
ErrorKind::InvalidData,
|
ErrorKind::InvalidData,
|
||||||
"Message is not a Request",
|
"Message is not a Request",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue