From b9ea06a01a8cef0f705c6f9fb4b32eb106c00ddd Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 26 Nov 2021 09:51:25 +0900
Subject: [PATCH] Don't stop even when caching local instance user

---
 plume-models/src/instance.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plume-models/src/instance.rs b/plume-models/src/instance.rs
index 5f9ef5a7..e7247d6d 100644
--- a/plume-models/src/instance.rs
+++ b/plume-models/src/instance.rs
@@ -11,6 +11,7 @@ use diesel::{self, result::Error::NotFound, ExpressionMethods, QueryDsl, RunQuer
 use once_cell::sync::OnceCell;
 use plume_common::utils::md_to_html;
 use std::sync::RwLock;
+use tracing::error;
 
 #[derive(Clone, Identifiable, Queryable)]
 pub struct Instance {
@@ -81,7 +82,7 @@ impl Instance {
     }
 
     pub fn create_local_instance_user(conn: &Connection) -> Result<User> {
-        let instance = Instance::get_local().expect("Failed to get local instance");
+        let instance = Instance::get_local()?;
         let email = format!("{}@{}", LOCAL_INSTANCE_USERNAME, &instance.public_domain);
         NewUser::new_local(
             conn,
@@ -109,9 +110,13 @@ impl Instance {
     }
 
     pub fn cache_local_instance_user(conn: &Connection) {
-        let user = Self::get_local_instance_user_uncached(conn).unwrap_or_else(|_| {
-            Self::create_local_instance_user(conn).expect("Failed to create local instance user")
-        });
+        let res = Self::get_local_instance_user_uncached(conn)
+            .or_else(|_| Self::create_local_instance_user(conn));
+        if res.is_err() {
+            error!("Failed to cache local instance user: {:?}", res);
+            return;
+        }
+        let user = res.expect("Unreachable");
         LOCAL_INSTANCE_USER
             .set(user)
             .expect("Failed to set local instance user");