magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use extern namespace in log wrapper macros

Browse source 
convert use tracing statements

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-24 22:20:07 +00:00
parent 0e46b750a0
commit c05f00661b
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/client/state.rs
View file

@ -1,5 +1,6 @@
use std::sync::Arc; use std::sync::Arc;
use conduit::{error, warn};
use ruma::{ use ruma::{
api::client::{ api::client::{
error::ErrorKind, error::ErrorKind,
@ -16,7 +17,6 @@ use ruma::{
serde::Raw, serde::Raw,
EventId, RoomId, UserId, EventId, RoomId, UserId,
}; };
use tracing::{error, log::warn};
use crate::{ use crate::{
service::{pdu::PduBuilder, server_is_ours}, service::{pdu::PduBuilder, server_is_ours},

10
src/core/debug.rs
View file

@ -14,9 +14,9 @@ pub use crate::utils::debug::*;
macro_rules! debug_event { macro_rules! debug_event {
( $level:expr, $($x:tt)+ ) => { ( $level:expr, $($x:tt)+ ) => {
if cfg!(debug_assertions) && cfg!(not(feature = "dev_release_log_level")) { if cfg!(debug_assertions) && cfg!(not(feature = "dev_release_log_level")) {
tracing::event!( $level, $($x)+ ); ::tracing::event!( $level, $($x)+ );
} else { } else {
tracing::debug!( $($x)+ ); ::tracing::debug!( $($x)+ );
} }
} }
} }
@ -27,7 +27,7 @@ macro_rules! debug_event {
#[macro_export] #[macro_export]
macro_rules! debug_error { macro_rules! debug_error {
( $($x:tt)+ ) => { ( $($x:tt)+ ) => {
$crate::debug_event!(tracing::Level::ERROR, $($x)+ ); $crate::debug_event!(::tracing::Level::ERROR, $($x)+ );
} }
} }
@ -37,7 +37,7 @@ macro_rules! debug_error {
#[macro_export] #[macro_export]
macro_rules! debug_warn { macro_rules! debug_warn {
( $($x:tt)+ ) => { ( $($x:tt)+ ) => {
$crate::debug_event!(tracing::Level::WARN, $($x)+ ); $crate::debug_event!(::tracing::Level::WARN, $($x)+ );
} }
} }
@ -47,7 +47,7 @@ macro_rules! debug_warn {
#[macro_export] #[macro_export]
macro_rules! debug_info { macro_rules! debug_info {
( $($x:tt)+ ) => { ( $($x:tt)+ ) => {
$crate::debug_event!(tracing::Level::INFO, $($x)+ ); $crate::debug_event!(::tracing::Level::INFO, $($x)+ );
} }
} }

10
src/core/log/mod.rs
View file

@ -20,25 +20,25 @@ pub use tracing_subscriber::EnvFilter;
#[macro_export] #[macro_export]
macro_rules! error { macro_rules! error {
( $($x:tt)+ ) => { tracing::error!( $($x)+ ); } ( $($x:tt)+ ) => { ::tracing::error!( $($x)+ ); }
} }
#[macro_export] #[macro_export]
macro_rules! warn { macro_rules! warn {
( $($x:tt)+ ) => { tracing::warn!( $($x)+ ); } ( $($x:tt)+ ) => { ::tracing::warn!( $($x)+ ); }
} }
#[macro_export] #[macro_export]
macro_rules! info { macro_rules! info {
( $($x:tt)+ ) => { tracing::info!( $($x)+ ); } ( $($x:tt)+ ) => { ::tracing::info!( $($x)+ ); }
} }
#[macro_export] #[macro_export]
macro_rules! debug { macro_rules! debug {
( $($x:tt)+ ) => { tracing::debug!( $($x)+ ); } ( $($x:tt)+ ) => { ::tracing::debug!( $($x)+ ); }
} }
#[macro_export] #[macro_export]
macro_rules! trace { macro_rules! trace {
( $($x:tt)+ ) => { tracing::trace!( $($x)+ ); } ( $($x:tt)+ ) => { ::tracing::trace!( $($x)+ ); }
} }