Merge branch 'logs' into 'master'

fix: logs for ruma crate

See merge request famedly/conduit!86

DEPLOY.md

@@ -99,7 +99,7 @@ allow_federation = true
 trusted_servers = ["matrix.org"]
 
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
-#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #workers = 4 # default: cpu core count * 2
 
 address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy

conduit-example.toml

@@ -36,7 +36,7 @@ max_request_size = 20_000_000 # in bytes
 trusted_servers = ["matrix.org"]
 
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
-#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"
 #workers = 4 # default: cpu core count * 2
 

debian/postinst

@@ -74,7 +74,7 @@ max_request_size = 20_000_000 # in bytes
 #allow_jaeger = false
 
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
-#max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
+#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"
 #workers = 4 # default: cpu core count * 2
 EOF

src/database.rs

@@ -67,7 +67,7 @@ fn default_max_request_size() -> u32 {
 }
 
 fn default_max_concurrent_requests() -> u16 {
-    4
+    100
 }
 
 fn default_log() -> String {

src/main.rs

@@ -212,8 +212,8 @@ async fn main() {
         let rocket = setup_rocket(raw_config, db);
         rocket.launch().await.unwrap();
     } else {
-        std::env::set_var("CONDUIT_LOG", config.log);
-        pretty_env_logger::init_custom_env("CONDUIT_LOG");
+        std::env::set_var("RUST_LOG", config.log);
+        tracing_subscriber::fmt::init();
 
         let rocket = setup_rocket(raw_config, db);
         rocket.launch().await.unwrap();