Skip to content

Commit

Permalink
Merge pull request #2013 from hannobraun/tracing
Browse files Browse the repository at this point in the history
Set up logging in model handler
  • Loading branch information
hannobraun authored Sep 7, 2023
2 parents 912f847 + 4b2a75a commit 0374669
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 3 deletions.
103 changes: 100 additions & 3 deletions Cargo.lock

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

5 changes: 5 additions & 0 deletions crates/fj/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ fj-math.workspace = true
fj-viewer.workspace = true
fj-window.workspace = true
thiserror = "1.0.48"
tracing = "0.1.37"

[dependencies.clap]
version = "4.4.2"
features = ["derive"]

[dependencies.tracing-subscriber]
version = "0.3.17"
features = ["env-filter"]
10 changes: 10 additions & 0 deletions crates/fj/src/handle_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use fj_core::{
};
use fj_interop::model::Model;
use fj_math::{Aabb, Point, Scalar};
use tracing_subscriber::prelude::*;

use crate::Args;

Expand All @@ -30,6 +31,11 @@ where
for<'r> (&'r M, Tolerance): Triangulate,
M: BoundingVolume<3>,
{
tracing_subscriber::registry()
.with(tracing_subscriber::fmt::layer())
.with(tracing_subscriber::EnvFilter::from_default_env())
.init();

let args = Args::parse();

if args.ignore_validation {
Expand Down Expand Up @@ -82,6 +88,10 @@ pub type Result = std::result::Result<(), Error>;
/// Error returned by [`handle_model`]
#[derive(thiserror::Error)]
pub enum Error {
/// Failed to set up logger
#[error("Failed to set up logger")]
Tracing(#[from] tracing::subscriber::SetGlobalDefaultError),

/// Error displaying model
#[error("Error displaying model")]
Display(#[from] crate::window::Error),
Expand Down

0 comments on commit 0374669

Please sign in to comment.