chore: Release

server: recover on slurp fetch failures
2025-03-12 16:44:04 -07:00 · 2025-03-12 16:43:48 -07:00
6 changed files with 19 additions and 16 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2965,7 +2965,7 @@ dependencies = [

 [[package]]
 name = "letterbox-notmuch"
-version = "0.10.3"
+version = "0.10.4"
 dependencies = [
 "itertools 0.14.0",
 "log",
@ -2980,14 +2980,14 @@ dependencies = [

 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.10.3"
+version = "0.10.4"
 dependencies = [
 "anyhow",
 ]

 [[package]]
 name = "letterbox-server"
-version = "0.10.3"
+version = "0.10.4"
 dependencies = [
 "ammonia",
 "anyhow",
@ -3030,7 +3030,7 @@ dependencies = [

 [[package]]
 name = "letterbox-shared"
-version = "0.10.3"
+version = "0.10.4"
 dependencies = [
 "build-info",
 "letterbox-notmuch",
@ -3039,7 +3039,7 @@ dependencies = [

 [[package]]
 name = "letterbox-web"
-version = "0.10.3"
+version = "0.10.4"
 dependencies = [
 "build-info",
 "build-info-build",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.10.3"
+version = "0.10.4"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"

 [profile.dev]
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -48,8 +48,8 @@ urlencoding = "2.1.3"
 #xtracing = { path = "../../xtracing" }
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 xtracing = { version = "0.3.0", registry = "xinu" }
-letterbox-notmuch = { version = "0.10.3", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.10.3", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.4", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.10.4", path = "../shared", registry = "xinu" }

 [build-dependencies]
 build-info-build = "0.0.40"
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@ -318,13 +318,16 @@ impl<'c> Transformer for SlurpContents<'c> {
        } else {
            let resp = reqwest::get(link.as_str()).await?;
            let status = resp.status();
-            if status.is_server_error() || retryable_status.contains(&status) {
-                return Err(TransformError::RetryableHttpStatusError(
-                    status,
-                    link.to_string(),
-                ));
+            if status.is_server_error() {
+                error!("status error for {link}: {status}");
+                return Ok(html.to_string());
+            }
+            if retryable_status.contains(&status) {
+                error!("retryable error for {link}: {status}");
+                return Ok(html.to_string());
            }
            if !status.is_success() {
+                error!("unsuccessful for {link}: {status}");
                return Ok(html.to_string());
            }
            let body = resp.text().await?;
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@ -12,5 +12,5 @@ version.workspace = true

 [dependencies]
 build-info = "0.0.40"
-letterbox-notmuch = { version = "0.10.3", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.4", path = "../notmuch", registry = "xinu" }
 serde = { version = "1.0.147", features = ["derive"] }
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.13.1", features = [
  "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { version = "0.10.3", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.10.3", path = "../notmuch", registry = "xinu" }
+letterbox-shared = { version = "0.10.4", path = "../shared", registry = "xinu" }
+letterbox-notmuch = { version = "0.10.4", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
Author	SHA1	Message	Date
Bill Thiede	1225483b57	chore: Release All checks were successful Continuous integration / Check (push) Successful in 35s Details Continuous integration / Test Suite (push) Successful in 40s Details Continuous integration / Trunk (push) Successful in 38s Details Continuous integration / Rustfmt (push) Successful in 32s Details Continuous integration / Disallow unused dependencies (push) Successful in 56s Details Continuous integration / build (push) Successful in 5m37s Details	2025-03-12 16:44:04 -07:00
Bill Thiede	daeb8c88a1	server: recover on slurp fetch failures	2025-03-12 16:43:48 -07:00