kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

parametrize poll return

master
Robert Jördens 2019-06-03 17:08:21 +00:00
parent ee15c27dd9
commit a8e1740759
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.rs
View File

@ -797,10 +797,10 @@ impl Server {
Self { data: Vec::new(), discard: false }
}
fn poll<T, F>(&mut self, socket: &mut net::socket::TcpSocket, f: F)
fn poll<T, F, R>(&mut self, socket: &mut net::socket::TcpSocket, f: F) -> Option<R>
where
T: DeserializeOwned,
F: FnOnce(&T),
F: FnOnce(&T) -> R,
{
while socket.can_recv() {
let found = socket.recv(|buf| {
@ -820,14 +820,15 @@ impl Server {
if self.discard {
self.discard = false;
json_reply(socket, &Response { code: 520, message: "command buffer overflow" });
self.data.clear();
} else {
let r = from_slice::<T>(&self.data);
self.data.clear();
match r {
Ok(res) => {
f(&res);
json_reply(socket, &Response{ code: 200, message: "ok" });
return;
let r = f(&res);
json_reply(socket, &Response { code: 200, message: "ok" });
return Some(r);
},
Err(err) => {
warn!("parse error {:?}", err);
@ -837,6 +838,7 @@ impl Server {
}
}
}
None
}
}