From cdc11511775bad6c5ac314cf55818756e1723b65 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Thu, 1 Jun 2023 21:01:14 +0200 Subject: [PATCH] create feature to switch between log and tracing --- Cargo.toml | 8 +++++++- src/errors.rs | 2 +- src/lib.rs | 4 ++-- src/prelude.rs | 4 ++++ src/twitch.rs | 2 +- src/youtube.rs | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/prelude.rs diff --git a/Cargo.toml b/Cargo.toml index 6b80b94..038fe41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,4 +12,10 @@ chrono = "0.4.23" google-youtube3 = "5.0.2" serde_json = "1.0.91" rand = "0.8.5" -log = "0.4.17" +log = { version = "0.4" , optional=true} +tracing = { version = "0.1.37" , optional=true} + +[features] +default = ["tracing"] +log = ["dep:log"] +tracing = ["dep:tracing"] diff --git a/src/errors.rs b/src/errors.rs index 43c3a69..2862abb 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,6 +1,6 @@ use std::fmt; -use log::warn; +use crate::prelude::*; #[derive(Debug, Clone)] pub struct BackoffError { diff --git a/src/lib.rs b/src/lib.rs index f2e71b5..7e9debe 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,7 @@ use rand::Rng; -use log::{trace, info}; - +mod prelude; +use crate::prelude::*; const EXTRA_BUFFER_TIME: u64 = 100; pub enum Api { diff --git a/src/prelude.rs b/src/prelude.rs new file mode 100644 index 0000000..5ca7d6d --- /dev/null +++ b/src/prelude.rs @@ -0,0 +1,4 @@ +#[cfg(feature = "log")] +pub use log::{debug, error, info, trace, warn}; +#[cfg(feature = "tracing")] +pub use tracing::{debug, error, info, trace, warn}; diff --git a/src/twitch.rs b/src/twitch.rs index 6774f4b..8492ce8 100644 --- a/src/twitch.rs +++ b/src/twitch.rs @@ -1,7 +1,7 @@ use std::error::Error; +use crate::prelude::*; use chrono::NaiveDateTime; -use log::{debug, error, info, trace, warn}; use reqwest::{Body, Client, IntoUrl, Request, Response}; use reqwest::header::HeaderMap; diff --git a/src/youtube.rs b/src/youtube.rs index 8f4fd21..5606648 100644 --- a/src/youtube.rs +++ b/src/youtube.rs @@ -1,7 +1,7 @@ use std::error::Error; use std::future::Future; -use log::{warn, info, trace}; +use crate::prelude::*; use google_youtube3::Error::BadRequest; use google_youtube3::hyper::{Body, Response};