octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify tracing output.

This commit is contained in:
Henry de Valence 2019-11-13 15:02:06 -08:00 committed by Deirdre Connolly
parent ec4f6bd9ea
commit 3b02b40758
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zebrad/src/commands/seed.rs
View File

@ -36,25 +36,21 @@ impl Service<Request> for SeedService {
type Future = type Future =
Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>; Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>;
#[instrument(skip(self, _cx))]
fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> { fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
debug!("SeedService.state: {:?}", self.state);
match self.state { match self.state {
SeederState::Ready(_) => return Poll::Ready(Ok(())), SeederState::Ready(_) => return Poll::Ready(Ok(())),
SeederState::AwaitingAddressBook(ref mut rx) => match rx.try_recv() { SeederState::AwaitingAddressBook(ref mut rx) => match rx.try_recv() {
Err(e) => { Err(e) => {
error!("SeedService oneshot sender dropped: {:?}", e); error!("oneshot sender dropped, failing service: {:?}", e);
return Poll::Ready(Err(e.into())); return Poll::Ready(Err(e.into()));
} }
Ok(None) => { Ok(None) => {
trace!("SeedService hasn't received a message via the oneshot yet."); trace!("awaiting address book, service is unready");
return Poll::Pending; return Poll::Pending;
} }
Ok(Some(address_book)) => { Ok(Some(address_book)) => {
info!( debug!("received address_book via oneshot, service becomes ready");
"SeedService received address_book via oneshot {:?}",
address_book
);
self.state = SeederState::Ready(address_book); self.state = SeederState::Ready(address_book);
return Poll::Ready(Ok(())); return Poll::Ready(Ok(()));
} }
@ -62,10 +58,11 @@ impl Service<Request> for SeedService {
} }
} }
// Note: the generated span applies only to this function, not
// to the future, but this is OK because the current implementation
// is not actually async.
#[instrument]
fn call(&mut self, req: Request) -> Self::Future { fn call(&mut self, req: Request) -> Self::Future {
let span = span!(Level::DEBUG, "SeedService::call", req = ?req);
let _guard = span.enter();
let address_book = if let SeederState::Ready(address_book) = &self.state { let address_book = if let SeederState::Ready(address_book) = &self.state {
address_book address_book
} else { } else {
@ -88,12 +85,12 @@ impl Service<Request> for SeedService {
// Finally, truncate the list so that we do not trivially // Finally, truncate the list so that we do not trivially
// reveal our entire peer set. // reveal our entire peer set.
peers.truncate(50); peers.truncate(50);
debug!(peers.len = peers.len(), peers = ?peers); debug!(peers.len = peers.len());
Ok(Response::Peers(peers)) Ok(Response::Peers(peers))
} }
_ => { _ => {
debug!("ignoring request"); debug!("ignoring request");
Ok::<Response, Self::Error>(Response::Ok) Ok(Response::Ok)
} }
}; };
return Box::pin(futures::future::ready(response)); return Box::pin(futures::future::ready(response));