Put console behind feature
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Aode (Lion) 2022-01-30 17:07:41 -06:00
parent 086d0597ce
commit 44f1cfd248
2 changed files with 10 additions and 2 deletions

View file

@ -11,12 +11,16 @@ build = "src/build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[features]
default = []
console = ["console-subscriber"]
[dependencies]
actix-rt = "2.3.0"
actix-web = { version = "4.0.0-beta.21", default-features = false }
awc = { version = "3.0.0-beta.19", default-features = false }
bcrypt = "0.10"
console-subscriber = "0.1"
console-subscriber = { version = "0.1", optional = true }
mime = "0.3"
minify-html = "0.8.0"
opentelemetry = { version = "0.16", features = ["rt-tokio"] }

View file

@ -1,5 +1,6 @@
use actix_web::{App, HttpServer};
use awc::Client;
#[cfg(feature = "console")]
use console_subscriber::ConsoleLayer;
use opentelemetry::{
sdk::{propagation::TraceContextPropagator, Resource},
@ -62,6 +63,7 @@ fn init_logger(opentelemetry_url: Option<&Url>) -> Result<(), Box<dyn std::error
.with_span_events(FmtSpan::NEW | FmtSpan::CLOSE)
.with_filter(targets.clone());
#[cfg(feature = "console")]
let console_layer = ConsoleLayer::builder()
.with_default_env()
.server_addr(([0, 0, 0, 0], 6669))
@ -69,10 +71,12 @@ fn init_logger(opentelemetry_url: Option<&Url>) -> Result<(), Box<dyn std::error
.spawn();
let subscriber = Registry::default()
.with(console_layer)
.with(format_layer)
.with(ErrorLayer::default());
#[cfg(feature = "console")]
let subscriber = subscriber.with(console_layer);
if let Some(url) = opentelemetry_url {
let tracer =
opentelemetry_otlp::new_pipeline()