diff options
| author | Timo Kösters <timo@koesters.xyz> | 2022-11-21 20:03:17 +0000 |
|---|---|---|
| committer | Timo Kösters <timo@koesters.xyz> | 2022-11-21 20:03:17 +0000 |
| commit | 9149be31af9adc51fa13ae3adecdff6ab04ee584 (patch) | |
| tree | d41b3fe5fa9d8d540670867e6ea1dc745796faa3 /src | |
| parent | 32a4ded4a1b9f8778dd939eaff180c010d9b1c7c (diff) | |
| parent | a3a1db124d2fdf78999b493e51dceb344683b502 (diff) | |
| download | conduit-9149be31af9adc51fa13ae3adecdff6ab04ee584.zip | |
Merge branch 'logs-cleanup' into 'next'
Clean some noisy logs
See merge request famedly/conduit!423
Diffstat (limited to 'src')
| -rw-r--r-- | src/api/server_server.rs | 4 | ||||
| -rw-r--r-- | src/service/rooms/event_handler/mod.rs | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/api/server_server.rs b/src/api/server_server.rs index f66e96c..b7f8807 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -55,7 +55,7 @@ use std::{ time::{Duration, Instant, SystemTime}, }; -use tracing::{error, info, warn}; +use tracing::{debug, error, info, warn}; /// Wraps either an literal IP address plus port, or a hostname plus complement /// (colon-plus-port if it was specified). @@ -724,7 +724,7 @@ pub async fn send_transaction_message_route( drop(mutex_lock); let elapsed = start_time.elapsed(); - warn!( + debug!( "Handling transaction of event {} took {}m{}s", event_id, elapsed.as_secs() / 60, diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs index 3b41e86..03f1f93 100644 --- a/src/service/rooms/event_handler/mod.rs +++ b/src/service/rooms/event_handler/mod.rs @@ -133,7 +133,8 @@ impl Service { .await?; let mut errors = 0; - for prev_id in dbg!(sorted_prev_events) { + debug!(events = ?sorted_prev_events, "Got previous events"); + for prev_id in sorted_prev_events { // Check for disabled again because it might have changed if services().rooms.metadata.is_disabled(room_id)? { return Err(Error::BadRequest( @@ -330,7 +331,7 @@ impl Service { // 4. fetch any missing auth events doing all checks listed here starting at 1. These are not timeline events // 5. Reject "due to auth events" if can't get all the auth events or some of the auth events are also rejected "due to auth events" // NOTE: Step 5 is not applied anymore because it failed too often - warn!("Fetching auth events for {}", incoming_pdu.event_id); + debug!(event_id = ?incoming_pdu.event_id, "Fetching auth events"); self.fetch_and_handle_outliers( origin, &incoming_pdu |