magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

proc macro ✨

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-24 00:14:03 +00:00
parent 2468e0c3de
commit 85f734ec74
10 changed files with 123 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/admin/handler.rs
View file

@ -1,7 +1,7 @@
use std::{panic::AssertUnwindSafe, time::Instant};
use clap::{CommandFactory, Parser};
use conduit::{error, trace, Error};
use conduit::{error, trace, utils::string::common_prefix, Error, Result};
use futures_util::future::FutureExt;
use ruma::{
events::{
@ -10,8 +10,6 @@ use ruma::{
},
OwnedEventId,
};
use conduit::{utils::string::common_prefix, Result};
use service::{
admin::{Command, CommandOutput, CommandResult, HandlerResult},
Services,
@ -36,7 +34,7 @@ pub(super) fn handle(command: Command) -> HandlerResult { Box::pin(handle_comman
#[tracing::instrument(skip_all, name = "admin")]
async fn handle_command(command: Command) -> CommandResult {
AssertUnwindSafe(process_command(&command))
AssertUnwindSafe(Box::pin(process_command(&command)))
.catch_unwind()
.await
.map_err(Error::from_panic)