Skip to content

Commit 6f88129

Browse files
authored
fix(updater): Propagate request error (#2439)
1 parent 9229f99 commit 6f88129

File tree

2 files changed

+26
-17
lines changed

2 files changed

+26
-17
lines changed

.changes/updater-request-error.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
updater: patch
3+
updater-js: patch
4+
---
5+
6+
Fixed an issue that caused the plugin to emit a `ReleaseNotFound` error instead of a `Reqwest` error when the http request in `check()` failed.

plugins/updater/src/updater.rs

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -383,26 +383,29 @@ impl Updater {
383383
.send()
384384
.await;
385385

386-
if let Ok(res) = response {
387-
if res.status().is_success() {
388-
// no updates found!
389-
if StatusCode::NO_CONTENT == res.status() {
390-
return Ok(None);
391-
};
392-
393-
raw_json = Some(res.json().await?);
394-
match serde_json::from_value::<RemoteRelease>(raw_json.clone().unwrap())
395-
.map_err(Into::into)
396-
{
397-
Ok(release) => {
398-
last_error = None;
399-
remote_release = Some(release);
400-
// we found a relase, break the loop
401-
break;
386+
match response {
387+
Ok(res) => {
388+
if res.status().is_success() {
389+
// no updates found!
390+
if StatusCode::NO_CONTENT == res.status() {
391+
return Ok(None);
392+
};
393+
394+
raw_json = Some(res.json().await?);
395+
match serde_json::from_value::<RemoteRelease>(raw_json.clone().unwrap())
396+
.map_err(Into::into)
397+
{
398+
Ok(release) => {
399+
last_error = None;
400+
remote_release = Some(release);
401+
// we found a relase, break the loop
402+
break;
403+
}
404+
Err(err) => last_error = Some(err),
402405
}
403-
Err(err) => last_error = Some(err),
404406
}
405407
}
408+
Err(err) => last_error = Some(err.into()),
406409
}
407410
}
408411

0 commit comments

Comments
 (0)