studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add optional support for tokio-console

Browse Source 
This turned out to be quite hairy, mostly because we need to apply the
config's log level filter to the actual logs (stdout and, optionally
sentry), but do not want to filter out the tokio tracing events needed by
the console_subscriber. I hit several edge cases in tracing getting
this to work, and we now depend on a git version of tracing with a
backported patch :(
This commit is contained in:
Benjamin Lee
2024-04-25 09:07:59 -07:00
committed by June
parent 341bafb91e
commit 8a5599adf9
8 changed files with 488 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/service/globals/mod.rs
View File

@@ -27,10 +27,9 @@ use ruma::{
};
use tokio::sync::{broadcast, watch::Receiver, Mutex, RwLock};
use tracing::{error, info, trace};
use tracing_subscriber::{EnvFilter, Registry};
use url::Url;
use crate::{services, Config, Result};
use crate::{services, Config, LogLevelReloadHandles, Result};
mod client;
mod data;
@@ -45,7 +44,7 @@ type SyncHandle = (
pub(crate) struct Service<'a> {
pub(crate) db: &'static dyn Data,
pub(crate) tracing_reload_handle: tracing_subscriber::reload::Handle<EnvFilter, Registry>,
pub(crate) tracing_reload_handle: LogLevelReloadHandles,
pub(crate) config: Config,
pub(crate) cidr_range_denylist: Vec<IPAddress>,
keypair: Arc<ruma::signatures::Ed25519KeyPair>,
@@ -99,8 +98,7 @@ impl Default for RotationHandler {
impl Service<'_> {
pub(crate) fn load(
db: &'static dyn Data, config: &Config,
tracing_reload_handle: tracing_subscriber::reload::Handle<EnvFilter, Registry>,
db: &'static dyn Data, config: &Config, tracing_reload_handle: LogLevelReloadHandles,
) -> Result<Self> {
let keypair = db.load_keypair();