merge develop into master #20

Merged
michael-bailey merged 181 commits from develop into master 2023-12-01 21:48:28 +00:00
1 changed files with 12 additions and 3 deletions
Showing only changes of commit 6b6a86168e - Show all commits

View File

@ -36,7 +36,7 @@ pub enum ConnectionMessage {
#[derive(Message)]
#[rtype(result = "()")]
pub(crate) enum ConnectionOuput {
pub enum ConnectionOuput {
RecvData(Addr<Connection>, SocketAddr, String),
ConnectionClosed(Addr<Connection>),
}
@ -98,9 +98,18 @@ impl Actor for Connection {
let mut reader = BufReader::new(read_half);
let mut buffer_string = String::new();
while let Ok(_) = reader.read_line(&mut buffer_string).await {
while let Ok(len) = reader.read_line(&mut buffer_string).await {
use SelfMessage::{UpdateObserversWithData};
use ConnectionMessage::CloseConnection;
if len == 0 {
println!("[Connection] connection closed");
addr.send(CloseConnection)
.await
.expect("[Connection] failed to send close message to self");
return
}
println!("[Connection] read line");
use SelfMessage::UpdateObserversWithData;
addr
.send(UpdateObserversWithData(buffer_string.clone()))
.await;