OMGeeky/tarpc
1
0
Fork 0
mirror of https://github.com/OMGeeky/tarpc.git synced 2026-01-04 18:43:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'debug' into 'master'

Browse Source 
Debug



See merge request !13
This commit is contained in:
Tim
2016-01-28 11:51:35 +05:30
parent 43cb920c56 707daff475
commit af2d701cfd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tarpc/src/protocol.rs
View File

@@ -139,6 +139,7 @@ impl<'a, S> ConnectionHandler<'a, S> where S: Serve {
loop {
match Self::read(read_stream, timeout) {
Ok(Packet { rpc_id, message, }) => {
debug!("ConnectionHandler: serving request, id: {}, message: {:?}", rpc_id, message);
inflight_rpcs.increment();
scope.spawn(move || {
let reply = server.serve(message);
@@ -164,9 +165,6 @@ impl<'a, S> ConnectionHandler<'a, S> where S: Serve {
Err(bincode::serde::DeserializeError::IoError(ref err))
if Self::timed_out(err.kind()) => {
if !shutdown.load(Ordering::SeqCst) {
info!("ConnectionHandler: read timed out ({:?}). Server not \
shutdown, so retrying read.",
err);
continue;
} else {
info!("ConnectionHandler: read timed out ({:?}). Server shutdown, so \
@@ -460,10 +458,14 @@ impl<Request, Reply> Client<Request, Reply>
err);
try!(self.requests.lock().unwrap().remove_tx(id));
}
debug!("Client: finishing rpc({:?})", request);
drop(state);
match rx.recv() {
Ok(msg) => Ok(msg),
Err(_) => Err(self.requests.lock().unwrap().get_error()),
Err(_) => {
debug!("locking requests map");
Err(self.requests.lock().unwrap().get_error())
}
}
}
}