berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Even more logging

This commit is contained in:
Maciej Hirsz 2019-11-06 16:58:33 +01:00
parent bf6bd2660f
commit 6052452094
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actix-web-actors/src/ws.rs
View File

@ -549,7 +549,7 @@ where
error!("Invalid UTF-8 encoding"); error!("Invalid UTF-8 encoding");
} }
Message::Text(std::str::from_utf8(&data)?.to_string()) Message::Text(text?.to_string())
} else { } else {
Message::Text(String::new()) Message::Text(String::new())
}) })
@ -604,8 +604,15 @@ where
match self.collector.take() { match self.collector.take() {
Collector::Text(mut buf) => { Collector::Text(mut buf) => {
buf.extend_from_slice(data); buf.extend_from_slice(data);
let text = std::str::from_utf8(&buf);
if text.is_err() {
error!("Invalid UTF-8 encoding");
}
Some(Message::Text( Some(Message::Text(
std::str::from_utf8(&buf)?.to_string() text?.to_string()
)) ))
} }
Collector::Binary(mut buf) => { Collector::Binary(mut buf) => {