Add case for non prime numbers
This commit is contained in:
parent
6a4d2b0b64
commit
c1da24ba29
1 changed files with 22 additions and 9 deletions
|
|
@ -11,7 +11,7 @@ const MAL_FORMAT: &str = "}mal";
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
struct Request {
|
struct Request {
|
||||||
method: String,
|
method: String,
|
||||||
number: u64,
|
number: serde_json::value::Number,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
|
|
@ -51,23 +51,36 @@ async fn handle_request(mut socket: TcpStream) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let message: serde_json::Value = serde_json::from_slice(&buf).unwrap();
|
||||||
|
|
||||||
|
log::info!("Message received: {}", message);
|
||||||
|
|
||||||
match serde_json::from_slice::<Request>(&buf) {
|
match serde_json::from_slice::<Request>(&buf) {
|
||||||
Ok(m) => {
|
Ok(m) => {
|
||||||
log::error!("Message received: {:?}", m);
|
let possible_prime = match m.number.to_string().parse::<u64>() {
|
||||||
log::error!("Right method set? {}", m.method == IS_PRIME.to_owned());
|
Ok(n) => n,
|
||||||
log::error!("Is {} a prime? {}", m.number, is_prime(m.number));
|
Err(e) => {
|
||||||
|
log::error!("Not a valid number: {}", e);
|
||||||
|
|
||||||
|
let _ = write.write(&MAL_FORMAT.as_bytes()).await;
|
||||||
|
let _ = write.write(&[b'\n']).await;
|
||||||
|
let _ = write.flush().await;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let res = Response {
|
let res = Response {
|
||||||
method: IS_PRIME.to_owned(),
|
method: IS_PRIME.to_owned(),
|
||||||
prime: is_prime(m.number),
|
prime: is_prime(possible_prime),
|
||||||
};
|
};
|
||||||
|
|
||||||
if m.method == IS_PRIME.to_owned() {
|
if m.method == IS_PRIME.to_owned() {
|
||||||
if let Err(e) = write
|
if let Err(e) = write
|
||||||
.write(&serde_json::to_string(&res).unwrap().as_bytes())
|
.write(&serde_json::to_string(&res).unwrap().as_bytes())
|
||||||
.await {
|
.await
|
||||||
log::error!("Error writing serialize step: {}", e);
|
{
|
||||||
}
|
log::error!("Error writing serialize step: {}", e);
|
||||||
|
}
|
||||||
if let Err(e) = write.write(&[b'\n']).await {
|
if let Err(e) = write.write(&[b'\n']).await {
|
||||||
log::error!("Error writing: {}", e);
|
log::error!("Error writing: {}", e);
|
||||||
}
|
}
|
||||||
|
|
@ -83,7 +96,7 @@ async fn handle_request(mut socket: TcpStream) {
|
||||||
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!");
|
||||||
}
|
}
|
||||||
if let Err(e)= write.flush().await {
|
if let Err(e) = write.flush().await {
|
||||||
log::error!("Error flushing socket!");
|
log::error!("Error flushing socket!");
|
||||||
}
|
}
|
||||||
log::info!("Wrote malformat response");
|
log::info!("Wrote malformat response");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue