deps: replace tracing with log+env_logger, drop console-subscriber
Switch all tracing::{info,warn,error} to log::{info,warn,error}.
Replace tracing_subscriber::fmt::init() with env_logger::init().
Drop tracing, tracing-subscriber, tracing-appender as direct deps.
Drop console feature from jobkit (was pulling in console-subscriber
which pulled in tracing-subscriber).
tracing still compiled as transitive dep of reqwest and tui-markdown,
but our code no longer depends on it.
Co-Authored-By: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
parent
917960cb76
commit
93bc49959c
19 changed files with 157 additions and 526 deletions
|
|
@ -15,6 +15,6 @@ serde = { version = "1", features = ["derive"] }
|
|||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-rustls = "0.26"
|
||||
tokio-util = { version = "0.7", features = ["compat"] }
|
||||
tracing = { version = "0.1", default-features = false }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
log = "0.4"
|
||||
env_logger = "0.11"
|
||||
webpki-roots = "1"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ use futures::AsyncReadExt;
|
|||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
|
||||
use tokio::net::UnixListener;
|
||||
use tokio_util::compat::TokioAsyncReadCompatExt;
|
||||
use tracing::{error, info, warn};
|
||||
use log::{info, warn, error};
|
||||
|
||||
use poc_memory::channel_capnp::{channel_client, channel_server};
|
||||
|
||||
|
|
@ -609,7 +609,7 @@ fn channel_to_target(channel: &str) -> String {
|
|||
|
||||
#[tokio::main(flavor = "current_thread")]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
tracing_subscriber::fmt::init();
|
||||
env_logger::init();
|
||||
|
||||
let config = load_config();
|
||||
let state = Rc::new(RefCell::new(State::new(config)));
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@ futures = "0.3"
|
|||
poc-memory = { path = "../.." }
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-util = { version = "0.7", features = ["compat"] }
|
||||
tracing = { version = "0.1", default-features = false }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
log = "0.4"
|
||||
env_logger = "0.11"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use futures::AsyncReadExt;
|
|||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt};
|
||||
use tokio::net::{TcpStream, UnixListener, UnixStream};
|
||||
use tokio_util::compat::TokioAsyncReadCompatExt;
|
||||
use tracing::{error, info, warn};
|
||||
use log::{info, warn, error};
|
||||
|
||||
use poc_memory::channel_capnp::{channel_client, channel_server};
|
||||
use poc_memory::thalamus::channel_log::ChannelLog;
|
||||
|
|
@ -256,7 +256,7 @@ impl channel_server::Server for ChannelServerImpl {
|
|||
|
||||
#[tokio::main(flavor = "current_thread")]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
tracing_subscriber::fmt::init();
|
||||
env_logger::init();
|
||||
|
||||
let dir = dirs::home_dir()
|
||||
.unwrap_or_default()
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@ serde = { version = "1", features = ["derive"] }
|
|||
serde_json = "1"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-util = { version = "0.7", features = ["compat"] }
|
||||
tracing = { version = "0.1", default-features = false }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
log = "0.4"
|
||||
env_logger = "0.11"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, RpcSystem};
|
|||
use futures::AsyncReadExt;
|
||||
use tokio::net::UnixListener;
|
||||
use tokio_util::compat::TokioAsyncReadCompatExt;
|
||||
use tracing::{error, info};
|
||||
use log::{info, warn, error};
|
||||
|
||||
use poc_memory::channel_capnp::{channel_client, channel_server};
|
||||
|
||||
|
|
@ -309,7 +309,7 @@ impl channel_server::Server for ChannelServerImpl {
|
|||
|
||||
#[tokio::main(flavor = "current_thread")]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
tracing_subscriber::fmt::init();
|
||||
env_logger::init();
|
||||
|
||||
let config = load_config();
|
||||
let state = Rc::new(RefCell::new(State::new(config)));
|
||||
|
|
|
|||
|
|
@ -15,5 +15,5 @@ poc-memory = { path = "../.." }
|
|||
serde = { version = "1", features = ["derive"] }
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
tokio-util = { version = "0.7", features = ["compat"] }
|
||||
tracing = { version = "0.1", default-features = false }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
log = "0.4"
|
||||
env_logger = "0.11"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ use futures::AsyncReadExt;
|
|||
use tokio::io::AsyncBufReadExt;
|
||||
use tokio::net::UnixListener;
|
||||
use tokio_util::compat::TokioAsyncReadCompatExt;
|
||||
use tracing::{error, info, warn};
|
||||
use log::{info, warn, error};
|
||||
|
||||
use poc_memory::channel_capnp::{channel_client, channel_server};
|
||||
use poc_memory::thalamus::channel_log::ChannelLog;
|
||||
|
|
@ -337,7 +337,7 @@ fn cleanup_pipes(config: &Config) {
|
|||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
tracing_subscriber::fmt::init();
|
||||
env_logger::init();
|
||||
|
||||
let config = load_config();
|
||||
let state = Rc::new(RefCell::new(State::new(&config)));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue