Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve logging #297

Merged
merged 4 commits into from
Mar 7, 2022
Merged

Improve logging #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
345517b
Respect `RUST_LOG` environment variable
hannobraun Mar 7, 2022
e34e2f4
Make log configuration explicit
hannobraun Mar 7, 2022
5a2fdc6
Use pretty log format
hannobraun Mar 7, 2022
1414ec6
Set default log level to WARN
hannobraun Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ path = "fj"

[dependencies.tracing-subscriber]
version = "0.3.9"
features = ["fmt"]
features = ["env-filter", "fmt"]
15 changes: 14 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ use std::{collections::HashMap, sync::mpsc, time::Instant};
use futures::executor::block_on;
use notify::Watcher as _;
use tracing::trace;
use tracing_subscriber::fmt::format;
use tracing_subscriber::EnvFilter;
use winit::{
event::{Event, WindowEvent},
event_loop::{ControlFlow, EventLoop},
Expand All @@ -34,7 +36,18 @@ use crate::{
};

fn main() -> anyhow::Result<()> {
tracing_subscriber::fmt::init();
// Respect `RUST_LOG`. If that's not defined or erroneous, log warnings and
// above.
//
// It would be better to fail, if `RUST_LOG` is erroneous, but I don't know
// how to distinguish between that and the "not defined" case.
tracing_subscriber::fmt()
.with_env_filter(
EnvFilter::try_from_default_env()
.unwrap_or_else(|_| EnvFilter::new("WARN")),
)
.event_format(format().pretty())
.init();

let args = Args::parse();
let model = Model::new(args.model);
Expand Down