zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean tracing_subscriber deprecation warnings.

This commit is contained in:
Henry de Valence 2019-09-19 19:01:21 -07:00 committed by Deirdre Connolly
parent b3e094bc40
commit a64a051276
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebrad/src/components/tracing.rs
View File

@ -9,7 +9,7 @@ use hyper::{Body, Request, Response, Server};
use tracing::Subscriber; use tracing::Subscriber;
use tracing_log::LogTracer; use tracing_log::LogTracer;
use tracing_subscriber::{filter::Filter, reload::Handle, FmtSubscriber}; use tracing_subscriber::{EnvFilter, reload::Handle, FmtSubscriber};
/// Abscissa component which runs a tracing filter endpoint. /// Abscissa component which runs a tracing filter endpoint.
#[derive(Component)] #[derive(Component)]
@ -17,7 +17,7 @@ use tracing_subscriber::{filter::Filter, reload::Handle, FmtSubscriber};
// XXX ideally this would be TracingEndpoint<S: Subscriber> // XXX ideally this would be TracingEndpoint<S: Subscriber>
// but this doesn't seem to play well with derive(Component) // but this doesn't seem to play well with derive(Component)
pub struct TracingEndpoint { pub struct TracingEndpoint {
filter_handle: Handle<Filter, tracing_subscriber::fmt::Formatter>, filter_handle: Handle<EnvFilter, tracing_subscriber::fmt::Formatter>,
} }
impl ::std::fmt::Debug for TracingEndpoint { impl ::std::fmt::Debug for TracingEndpoint {
@ -45,7 +45,7 @@ impl TracingEndpoint {
.with_ansi(true) .with_ansi(true)
// Set the initial filter from the RUST_LOG env variable // Set the initial filter from the RUST_LOG env variable
// XXX pull from config file? // XXX pull from config file?
.with_filter(Filter::from_default_env()) .with_env_filter(EnvFilter::from_default_env())
.with_filter_reloading(); .with_filter_reloading();
let filter_handle = builder.reload_handle(); let filter_handle = builder.reload_handle();
let subscriber = builder.finish(); let subscriber = builder.finish();
@ -92,18 +92,18 @@ impl TracingEndpoint {
} }
fn reload_filter_from_chunk<S: Subscriber>( fn reload_filter_from_chunk<S: Subscriber>(
handle: Handle<Filter, S>, handle: Handle<EnvFilter, S>,
chunk: hyper::Chunk, chunk: hyper::Chunk,
) -> Result<(), String> { ) -> Result<(), String> {
let bytes = chunk.into_bytes(); let bytes = chunk.into_bytes();
let body = std::str::from_utf8(bytes.as_ref()).map_err(|e| format!("{}", e))?; let body = std::str::from_utf8(bytes.as_ref()).map_err(|e| format!("{}", e))?;
trace!(request.body = ?body); trace!(request.body = ?body);
let filter = body.parse::<Filter>().map_err(|e| format!("{}", e))?; let filter = body.parse::<EnvFilter>().map_err(|e| format!("{}", e))?;
handle.reload(filter).map_err(|e| format!("{}", e)) handle.reload(filter).map_err(|e| format!("{}", e))
} }
async fn filter_handler<S: Subscriber>( async fn filter_handler<S: Subscriber>(
handle: Handle<Filter, S>, handle: Handle<EnvFilter, S>,
req: Request<Body>, req: Request<Body>,
) -> Result<Response<Body>, hyper::Error> { ) -> Result<Response<Body>, hyper::Error> {
use futures_util::TryStreamExt; use futures_util::TryStreamExt;