From b34d78a030c664d6c17028710f92e2a3918bef2e Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Thu, 19 Sep 2024 12:37:22 -0700 Subject: [PATCH] skip over broken keys instead of aborting Errors will show up in the logs in this case with detailed information about what broke. In the future we should add some kind of database integrity check functionality and also functionality to repair/delete broken data, but for now this at least makes it work 99.99% of the time. --- src/service/admin.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/service/admin.rs b/src/service/admin.rs index 81a5c017..cf8ab5db 100644 --- a/src/service/admin.rs +++ b/src/service/admin.rs @@ -844,7 +844,10 @@ impl Service { }); while let Some(mxc) = rx.recv().await { - let mxc = mxc?; + let Ok(mxc) = mxc else { + continue; + }; + let server_name = mxc.server_name(); if server_name == Ok(services().globals.server_name()) {