better error handling

sqlpage · Jul 7, 2023 · b2a14aa · b2a14aa
1 parent e655b74
commit b2a14aa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/render.rs b/src/render.rs
@@ -90,6 +90,7 @@ impl<W: std::io::Write> HeaderContext<W> {
         let remove = obj.get("remove");
         if remove == Some(&json!(true)) || remove == Some(&json!(1)) {
             self.response.cookie(cookie);
+            log::trace!("Removing cookie {}", name);
             return Ok(self);
         }
 
@@ -116,11 +117,15 @@ impl<W: std::io::Write> HeaderContext<W> {
                 actix_web::cookie::time::OffsetDateTime::from_unix_timestamp(expires)?,
             ));
         }
+        log::trace!("Setting cookie {}", cookie);
         self.response.cookie(cookie);
         Ok(self)
     }
+
     async fn start_body(self, data: JsonValue) -> anyhow::Result<PageContext<W>> {
-        let renderer = RenderContext::new(self.app_state, self.writer, data).await?;
+        let renderer = RenderContext::new(self.app_state, self.writer, data)
+            .await
+            .with_context(|| "Failed to create a render context from the header context.")?;
         let http_response = self.response;
         Ok(PageContext::Body {
             renderer,
@@ -129,7 +134,9 @@ impl<W: std::io::Write> HeaderContext<W> {
     }
 
     pub async fn close(mut self) -> anyhow::Result<(RenderContext<W>, HttpResponse)> {
-        let renderer = RenderContext::new(self.app_state, self.writer, JsonValue::Null).await?;
+        let renderer = RenderContext::new(self.app_state, self.writer, JsonValue::Null)
+            .await
+            .with_context(|| "Failed to create a render context when closing the header context.")?;
         Ok((renderer, self.response.finish()))
     }
 }

diff --git a/src/webserver/http.rs b/src/webserver/http.rs
@@ -152,11 +152,10 @@ async fn build_response_header_and_stream<S: Stream<Item = DbItem>>(
     while let Some(item) = stream.next().await {
         match item {
             DbItem::Row(data) => {
-                match head_context
-                    .handle_row(data)
-                    .await
-                    .map_err(ErrorInternalServerError)?
-                {
+                match head_context.handle_row(data).await.map_err(|e| {
+                    log::error!("Error while handling header context data: {e}");
+                    ErrorInternalServerError(e)
+                })? {
                     PageContext::Header(h) => {
                         head_context = h;
                     }
@@ -187,10 +186,10 @@ async fn build_response_header_and_stream<S: Stream<Item = DbItem>>(
         }
     }
     log::debug!("No SQL statements left to execute for the body of the response");
-    let (renderer, http_response) = head_context
-        .close()
-        .await
-        .map_err(ErrorInternalServerError)?;
+    let (renderer, http_response) = head_context.close().await.map_err(|e| {
+        log::error!("Error while closing header context: {e}");
+        ErrorInternalServerError(e)
+    })?;
     Ok(ResponseWithWriter {
         http_response,
         renderer,
@@ -230,10 +229,11 @@ async fn render_sql(
             }) => {
                 resp_send
                     .send(http_response)
-                    .unwrap_or_else(|_| log::error!("could not send headers"));
+                    .unwrap_or_else(|e| log::error!("could not send headers {e:?}"));
                 stream_response(database_entries_stream, renderer).await;
             }
             Err(e) => {
+                log::error!("An error occured while building response headers: {e}");
                 let http_response = ErrorInternalServerError(e).into();
                 resp_send
                     .send(http_response)