macltok

public

Star0

Fork 0

Watch0

114 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `2819830aef32`

tarball

atagen <boss@atagen.co>2026-10-26 08:44 UTC

4 files changed+35-1

engine: log each command and room open phase at debug

A device trace of the wedge after the first room opens had no macltok lines at all, so nothing said which command or open phase stopped. Labels stop at the variant path, so message content and upload bytes never reach a log.

Modified file: src/engine/executor.rs+21 additions@@ -94,3 +94,24 @@ pub(crate) async fn derive<T: Send + 'static>(work: impl FnOnce() -> T + Send + 
 pub(crate) async fn derive<T>(work: impl FnOnce() -> T) -> T {
     work()
 }
+
+/// a command's variant path such as `Room(Open`, cut off before any content reaches a log
+pub(crate) fn label(command: &impl std::fmt::Debug) -> String {
+    use std::fmt::Write;
+
+    struct Label(String);
+    impl Write for Label {
+        fn write_str(&mut self, text: &str) -> std::fmt::Result {
+            for character in text.chars() {
+                if !(character.is_alphanumeric() || character == '_' || character == '(') {
+                    return Err(std::fmt::Error);
+                }
+                self.0.push(character);
+            }
+            Ok(())
+        }
+    }
+    let mut label = Label(String::new());
+    let _ = write!(label, "{command:?}");
+    label.0.trim_end_matches('(').to_owned()
+}

Modified file: src/engine/mod.rs+1

@@ -751,6 +751,7 @@ impl Engine {

751751

752752 /// hands back the shutdown request's responder, which is answered once we've stopped

753753 async fn dispatch(&mut self, Request { command, reply }: Request) -> Option<Responder> {

754+ tracing::debug!(command = %executor::label(&command), "engine command");

754755 let client = self.client.clone();

755756 match command {

756757 Command::Lifecycle(LifecycleCommand::Shutdown) => return Some(reply),

Modified file: src/engine/room.rs+11 additions−1 deletions@@ -5,7 +5,7 @@ use matrix_sdk_ui::timeline::{RoomExt, Timeline, TimelineFocus, TimelineReadRece
 use ruma::OwnedRoomId;
 use tokio::sync::mpsc;
 
-use super::executor::{AbortHandle, JoinError, TaskSet, is_panic, resume_unwind};
+use super::executor::{AbortHandle, JoinError, TaskSet, is_panic, label, resume_unwind};
 use super::repair::{Completion, Outcome, RepairController};
 use super::timeline::{SessionContext, TaskGuard, TimelineSession};
 use crate::{
@@ -73,6 +73,7 @@ impl RoomActor {
     }
 
     async fn serve(&mut self) {
+        tracing::debug!(room_id = %self.room_id, "building the room timeline");
         let timeline = match build_timeline(
             &self.room,
             TimelineFocus::Live {
@@ -84,6 +85,7 @@ impl RoomActor {
             Ok(timeline) => timeline,
             Err(error) => return self.refuse_everything(error).await,
         };
+        tracing::debug!(room_id = %self.room_id, "starting the room timeline session");
         let Ok(room_timeline) = TimelineSession::start(
             TimelineId::Room(self.room_id.clone()),
             timeline,
@@ -104,7 +106,9 @@ impl RoomActor {
             work: TaskSet::new(),
         };
         let mut repair = RepairController::new(self.room.clone(), self.context.clone());
+        tracing::debug!(room_id = %self.room_id, "starting recent history");
         repair.start_recent().await;
+        tracing::debug!(room_id = %self.room_id, "room opened");
         for reply in self.opening.drain(..) {
             reply.done(Ok(()));
         }
@@ -217,10 +221,16 @@ impl RoomActor {
                     Some(ActorRequest::Close(reply)) => return Some(reply),
                     Some(ActorRequest::Open(reply)) => reply.done(timelines.room.resync().await),
                     Some(ActorRequest::Execute(command, reply)) => {
+                        let label = label(&command);
+                        tracing::debug!(room_id = %self.room_id, command = %label, "room command");
                         timelines.execute(command, reply, &self.room).await;
+                        tracing::debug!(room_id = %self.room_id, command = %label, "room command handed off");
                     }
                     Some(ActorRequest::Repair(command, reply)) => {
+                        let label = label(&command);
+                        tracing::debug!(room_id = %self.room_id, command = %label, "room repair command");
                         repair.execute(command, reply).await;
+                        tracing::debug!(room_id = %self.room_id, command = %label, "room repair command handed off");
                     }
                 },
                 completion = repair.next_completion(), if repair.is_running() => {

Modified file: src/engine/timeline.rs+2 additions@@ -500,10 +500,12 @@ async fn run_pagination(
         if events.send(history(HistoryState::Loading)).await.is_err() {
             return;
         }
+        tracing::debug!(?timeline_id, limit, "paginating backwards");
         let result = timeline
             .paginate_backwards(limit.max(1))
             .await
             .map_err(timeline_error);
+        tracing::debug!(?timeline_id, ?result, "paginated backwards");
         let state = match &result {
             Ok(true) => HistoryState::StartReached,
             Ok(false) => HistoryState::Idle,

macltok

Commit 2819830aef32

Commit `2819830aef32`