Nickiel/church_controller_rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed failed flag exiting

Browse source
This commit is contained in:
Nickiel12 2021-12-18 18:21:54 -08:00
parent 7ecc687f36
commit 8d09c6142c
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/modules/socket_handler.rs
View file

@ -33,19 +33,22 @@ impl Socket {
pub fn handle_client(mut stream: TcpStream, update_tx: Sender<String>, program_shutdown_flag: sync_flag::SyncFlagRx) { pub fn handle_client(mut stream: TcpStream, update_tx: Sender<String>, program_shutdown_flag: sync_flag::SyncFlagRx) {
let mut buffer = [0; 1024]; let mut buffer = [0; 1024];
stream.set_read_timeout(Some(Duration::from_millis(100))).expect("Could not set a read timeout");
while program_shutdown_flag.get() {
match stream.read(&mut buffer) {
Err(_) => {continue},
Ok(read_size) => {
//Tcp is supposed to have a 0 byte read if closed by client
if read_size == 0 || !program_shutdown_flag.get() {
break;
loop { } else {
let read_size = stream.read(&mut buffer).unwrap(); let output = String::from_utf8_lossy(&buffer[0..read_size]);
update_tx.send(output.into_owned()).unwrap();
//Tcp is supposed to have a 0 byte read if closed by client }
if read_size == 0 || !program_shutdown_flag.get() { }
stream.shutdown(Shutdown::Both).unwrap();
thread::sleep(Duration::from_millis(75));
break;
} }
let output = String::from_utf8_lossy(&buffer[0..read_size]);
update_tx.send(output.into_owned()).unwrap();
} }
stream.shutdown(Shutdown::Both).unwrap();
} }
} }