chore: bump patch external crates

Cargo.toml

@@ -22,3 +22,8 @@ members = [
 exclude = [
     "frontend/player",
 ]
+
+[patch.crates-io]
+fred = { git = "https://github.com/ScuffleTV/fred.rs" }
+tracing-log = { git = "https://github.com/ScuffleTV/tracing" }
+tracing-subscriber = { git = "https://github.com/ScuffleTV/tracing" }

common/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["Scuffle <[email protected]>"]
 description = "Scuffle Common Library"
 
 [features]
-logging = ["dep:log", "dep:tracing", "dep:tracing-log", "dep:tracing-subscriber", "dep:arc-swap", "dep:anyhow"]
+logging = ["dep:log", "dep:tracing", "dep:tracing-log", "dep:tracing-subscriber", "dep:arc-swap", "dep:anyhow", "dep:once_cell"]
 rmq = ["dep:lapin", "dep:arc-swap", "dep:anyhow", "dep:futures", "dep:tracing", "dep:tokio", "dep:async-stream", "prelude"]
 grpc = ["dep:tonic", "dep:anyhow", "dep:async-trait", "dep:futures", "dep:http", "dep:tower", "dep:trust-dns-resolver", "dep:tracing"]
 context = ["dep:tokio", "dep:tokio-util"]
@@ -33,7 +33,8 @@ tonic = { version = "0", features = ["tls"], optional = true }
 tokio = { version = "1", features = ["sync", "rt"], optional = true }
 serde = { version = "1", features = ["derive"], optional = true }
 lapin = { version = "2.0.3", features = ["native-tls"], optional = true }
-tracing-log = { version = "0", features = ["env_logger"], optional = true }
+tracing-log = { version = "0", features = ["env_logger"], optional = true, git = "https://github.com/tokio-rs/tracing.git" }
+once_cell = { version = "1", optional = true }
 trust-dns-resolver = { version = "0", features = ["tokio-runtime"], optional = true }
 tracing-subscriber = { version = "0", features = ["fmt", "env-filter", "json"], optional = true }
 

common/src/logging.rs

@@ -1,58 +1,32 @@
-use std::{str::FromStr, sync::RwLock};
+use std::str::FromStr;
 
 use anyhow::Result;
-use tracing_subscriber::{
-    prelude::*,
-    reload::{self, Handle},
-    EnvFilter, Layer, Registry,
-};
+use once_cell::sync::OnceCell;
+use tracing_subscriber::{prelude::*, reload::Handle, EnvFilter};
 
-type HandleType = Handle<EnvFilter, Registry>;
-
-static ONCE: std::sync::Once = std::sync::Once::new();
-static RELOAD_HANDLE: RwLock<Option<HandleType>> = RwLock::new(None);
+static RELOAD_HANDLE: OnceCell<Handle<EnvFilter>> = OnceCell::new();
 
 pub fn init(level: &str, json: bool) -> Result<()> {
-    let mut result: Result<(), anyhow::Error> = Ok(());
-    ONCE.call_once(|| {
-        let (env_filter, handle) =
-            reload::Layer::new(EnvFilter::from_str(level).expect("failed to parse log level"));
+    let reload = RELOAD_HANDLE.get_or_try_init(|| {
+        let env_filter = EnvFilter::from_str(level).expect("failed to parse log level");
 
-        let filter = tracing_subscriber::fmt::layer()
+        let filter = tracing_subscriber::fmt()
             .with_line_number(true)
-            .with_file(true);
-
-        if json {
-            let filter = filter.json().with_filter(env_filter);
+            .with_file(true)
+            .with_env_filter(env_filter)
+            .with_filter_reloading();
 
-            let registry = tracing_subscriber::registry().with(filter);
+        let handle = filter.reload_handle();
 
-            result = tracing::subscriber::set_global_default(registry).map_err(|e| e.into());
-            if result.is_err() {
-                return;
-            }
+        if json {
+            filter.json().finish().try_init()
         } else {
-            let filter = filter.with_filter(env_filter);
-
-            let registry = tracing_subscriber::registry().with(filter);
-
-            result = tracing::subscriber::set_global_default(registry).map_err(|e| e.into());
-            if result.is_err() {
-                return;
-            }
+            filter.pretty().finish().try_init()
         }
+        .map(|_| handle)
+    })?;
 
-        *RELOAD_HANDLE.write().expect("failed to write to handler") = Some(handle);
-    });
-
-    result?;
-
-    RELOAD_HANDLE
-        .read()
-        .expect("failed to read mutex")
-        .as_ref()
-        .expect("failed to get reload handle")
-        .reload(level)?;
+    reload.reload(level)?;
 
     Ok(())
 }

frontend/website/package.json

@@ -56,8 +56,8 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@fontsource/be-vietnam-pro": "^5.0.3",
-		"@fontsource/comfortaa": "^5.0.3",
+		"@fontsource/be-vietnam-pro": "^5.0.4",
+		"@fontsource/comfortaa": "^5.0.4",
 		"@urql/svelte": "^4.0.2",
 		"graphql": "^16.7.1",
 		"graphql-ws": "^5.14.0",