serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-27 21:13:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'logs' into 'master'

Browse source 
fix: logs for ruma crate

See merge request famedly/conduit!86
This commit is contained in:
Timo Kösters 2021-05-24 16:08:56 +00:00
commit 1aec80c57c
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPLOY.md
View file

@ -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

2
conduit-example.toml
View file

@ -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

2
debian/postinst vendored
View file

@ -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

2
src/database.rs
View file

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

4
src/main.rs
View file

@ -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();