mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-09-24 13:00:12 +00:00
Code Issues Projects Releases Wiki Activity

reqwesthttpsrc: Correctly forward Future errors instead of mapping them all to timeouts

Browse source
This commit is contained in:
Sebastian Dröge 2019-10-04 17:30:49 +03:00
parent 120f85ac71
commit 99836709fa
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-plugin-reqwest/src/reqwesthttpsrc.rs
View file

@ -481,7 +481,7 @@ impl ReqwestHttpSrc {
let uri_clone = uri.clone();
let res = self.wait(req.send().map_err(move |err| {
gst_error_msg!(
gst::ResourceError::Read,
gst::ResourceError::OpenRead,
["Failed to fetch {}: {:?}", uri_clone, err]
)
}));
@ -633,7 +633,15 @@ impl ReqwestHttpSrc {
Either::B(
future
.timeout(Duration::from_secs(timeout.into()))
.map_err(|_err| gst_error_msg!(gst::ResourceError::Read, ["Request timeout"])),
.map_err(|err| {
if err.is_elapsed() {
gst_error_msg!(gst::ResourceError::Read, ["Request timeout"])
} else if err.is_inner() {
err.into_inner().unwrap()
} else {
gst_error_msg!(gst::ResourceError::Read, ["Timer error: {}", err])
}
}),
)
};