feat: better error handling

crates/daemons/crond/src/main.rs

@@ -1,19 +1,32 @@
-use revolt_config::configure;
-use revolt_database::DatabaseInfo;
+use std::{future::Future, time::Duration};
+
+use revolt_config::{configure, capture_error};
+use revolt_database::{Database, DatabaseInfo};
 use revolt_result::Result;
 use tasks::{file_deletion, prune_dangling_files};
-use tokio::try_join;
+use tokio::{join, time::sleep};
 
 pub mod tasks;
 
+pub async fn cron_task_wrapper<Fut: Future<Output = Result<()>>>(func: fn(Database) -> Fut, db: Database) {
+    loop {
+        if let Err(error) = func(db.clone()).await {
+            log::error!("cron task failed unexpectidly: {error:?}\nRetrying after 60s");
+            capture_error(&error);
+        }
+
+        sleep(Duration::from_secs(60)).await;
+    }
+}
+
 #[tokio::main]
-async fn main() -> Result<()> {
+async fn main() {
     configure!(crond);
 
     let db = DatabaseInfo::Auto.connect().await.expect("database");
-    try_join!(
-        file_deletion::task(db.clone()),
-        prune_dangling_files::task(db)
-    )
-    .map(|_| ())
+
+    join!(
+        cron_task_wrapper(file_deletion::task, db.clone()),
+        cron_task_wrapper(prune_dangling_files::task, db.clone()),
+    );
 }

crates/daemons/pushd/src/consumers/inbound/ack.rs

@@ -123,24 +123,26 @@ impl AsyncConsumer for AckConsumer {
                     token: session.subscription.as_ref().unwrap().auth.clone(),
                     extras: Default::default(),
                 };
-                let raw_service_payload = serde_json::to_string(&service_payload);
 
-                if let Ok(p) = raw_service_payload {
-                    let args = BasicPublishArguments::new(
-                        config.pushd.exchange.as_str(),
-                        config.pushd.apn.queue.as_str(),
-                    )
-                    .finish();
+                match serde_json::to_string(&service_payload) {
+                    Ok(p) => {
+                        let args = BasicPublishArguments::new(
+                            config.pushd.exchange.as_str(),
+                            config.pushd.apn.queue.as_str(),
+                        )
+                        .finish();
 
-                    log::debug!(
-                        "Publishing ack to apn session {}",
-                        session.subscription.as_ref().unwrap().auth
-                    );
+                        log::debug!(
+                            "Publishing ack to apn session {}",
+                            session.subscription.as_ref().unwrap().auth
+                        );
 
-                    publish_message(self, p.into(), args).await;
-                } else {
-                    log::warn!("Failed to serialize ack badge update payload!");
-                    revolt_config::capture_error(&raw_service_payload.unwrap_err());
+                        publish_message(self, p.into(), args).await;
+                    },
+                    Err(e) => {
+                        log::warn!("Failed to serialize ack badge update payload!");
+                        revolt_config::capture_error(&e);
+                    }
                 }
             }
         }