log error first before cancelling

crates/katana/tasks/src/manager.rs

@@ -47,8 +47,8 @@ impl TaskManager {
         self.on_cancel.cancelled().await;
     }
 
-    /// Shutdowns the manger and wait until all tasks are finished, either due to completion or
-    /// cancellation.
+    /// Shuts down the manager and wait until all currently running tasks are finished, either due
+    /// to completion or cancellation.
     ///
     /// No task can be spawned on the manager after this method is called.
     pub async fn shutdown(self) {

crates/katana/tasks/src/task.rs

@@ -131,9 +131,9 @@ impl<'a> CriticalTaskBuilder<'a> {
         let fut = AssertUnwindSafe(fut)
             .catch_unwind()
             .map_err(move |error| {
-                ct.cancel();
                 let error = PanickedTaskError { error };
                 error!(%error, task = task_name, "Critical task failed.");
+                ct.cancel();
                 error
             })
             .map(drop);