fixed unhandled store errors

babymotte · Aug 24, 2023 · cba80e1 · cba80e1
1 parent ec25306
commit cba80e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/worterbuch/src/server/common/v1_0.rs b/worterbuch/src/server/common/v1_0.rs
@@ -473,7 +473,10 @@ async fn unsubscribe(
 ) -> WorterbuchResult<()> {
     let mut wb = worterbuch.write().await;
 
-    wb.unsubscribe(client_id, msg.transaction_id)?;
+    if let Err(e) = wb.unsubscribe(client_id, msg.transaction_id) {
+        handle_store_error(e, client, msg.transaction_id).await?;
+        return Ok(());
+    };
     let response = Ack {
         transaction_id: msg.transaction_id,
     };
@@ -672,7 +675,10 @@ async fn unsubscribe_ls(
 ) -> WorterbuchResult<()> {
     let mut wb = worterbuch.write().await;
 
-    wb.unsubscribe_ls(client_id, msg.transaction_id)?;
+    if let Err(e) = wb.unsubscribe_ls(client_id, msg.transaction_id) {
+        handle_store_error(e, client, msg.transaction_id).await?;
+        return Ok(());
+    }
     let response = Ack {
         transaction_id: msg.transaction_id,
     };

diff --git a/worterbuch/src/server/poem.rs b/worterbuch/src/server/poem.rs
@@ -1,5 +1,5 @@
 use crate::{server::common::process_incoming_message, Config, Worterbuch};
-use anyhow::{anyhow, Context};
+use anyhow::anyhow;
 use futures::{sink::SinkExt, stream::StreamExt};
 use poem::{
     get, handler,
@@ -358,7 +358,7 @@ impl ClientHandler {
                                     tx.clone(),
                                     &self.proto_version,
                                 )
-                                .await.context("Error processing incoming message")?;
+                                .await?;
                                 self.handshake_complete |= msg_processed && handshake;
                                 if !msg_processed {
                                     break;
@@ -376,15 +376,15 @@ impl ClientHandler {
                 },
                 recv = rx.recv() => if let Some(text) = recv {
                     let msg = Message::text(text);
-                    self.send_with_timeout(msg).await.context("Error sending message to client")?;
+                    self.send_with_timeout(msg).await?;
                 } else {
                     break;
                 },
                 _ = keepalive_rx.recv() => {
                     // check how long ago the last websocket message was received
                     self.check_client_keepalive()?;
                     // send out websocket message if the last has been more than a second ago
-                    self.send_keepalive().await.context("Error sending keepalive signal")?;
+                    self.send_keepalive().await?;
                 }
             }
         }