Merge branch 'main' into errors

bytebeamio · Apr 1, 2024 · c8a94c0 · c8a94c0
2 parents 7d0e6f0 + 88b0fba
commit c8a94c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/uplink/src/base/actions.rs b/uplink/src/base/actions.rs
@@ -13,8 +13,6 @@ pub struct Action {
     // action id
     #[serde(alias = "id")]
     pub action_id: String,
-    // determines if action is a process
-    pub kind: String,
     // action name
     pub name: String,
     // action payload. json. can be args/payload. depends on the invoked command

diff --git a/uplink/src/collector/downloader.rs b/uplink/src/collector/downloader.rs
@@ -185,13 +185,13 @@ impl FileDownloader {
         loop {
             match self.download(req, &mut download).await {
                 Ok(_) => break,
-                Err(Error::Reqwest(e)) => {
+                Err(Error::Reqwest(e)) if !e.is_status => {
                     let status = ActionResponse::progress(&self.action_id, "Download Failed", 0)
                         .set_sequence(self.sequence())
                         .add_error(e.to_string());
                     self.bridge_tx.send_action_response(status).await;
                     error!("Download failed: {e}");
-                }
+                },
                 Err(e) => return Err(e),
             }
             tokio::time::sleep(Duration::from_secs(1)).await;